From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 5 Feb 2012 15:17:09 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c404ff637035f3815b1b2907f2b694f7cfa09077;p=imagemagick

---

diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index 803bc9890..39335b626 100644
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -71,8 +71,7 @@ static inline MagickBooleanType IsGrayColorspace(
 static inline MagickBooleanType IsRGBColorspace(const ColorspaceType colorspace)
 {
   if ((IsGrayColorspace(colorspace) != MagickFalse) ||
-      (colorspace == RGBColorspace) || (colorspace == sRGBColorspace) ||
-      (colorspace == TransparentColorspace))
+      (colorspace == RGBColorspace) || (colorspace == TransparentColorspace))
     return(MagickTrue);
   return(MagickFalse);
 }
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 707dcb628..cbc3e4a48 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -77,7 +77,7 @@ typedef struct _TransformPacket
 } TransformPacket;
 
 /*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -1252,13 +1252,10 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
   /*
     Convert the reference image from an alternate colorspace to RGB.
   */
-  if ((colorspace == RGBColorspace) || (colorspace == sRGBColorspace) ||
-      (colorspace == TransparentColorspace))
+  if ((colorspace == RGBColorspace) || (colorspace == TransparentColorspace))
     return(TransformRGBImage(image,colorspace,exception));
   status=MagickTrue;
-  if ((image->colorspace != RGBColorspace) &&
-      (image->colorspace != TransparentColorspace) &&
-      (image->colorspace != GRAYColorspace))
+  if (IsRGBColorspace(image->colorspace) == MagickFalse)
     status=TransformRGBImage(image,image->colorspace,exception);
   /*
     Convert the reference image from RGB to an alternate colorspace.
@@ -2176,7 +2173,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
       ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
         image->filename);
     }
-  switch (colorspace)
+  switch (image->colorspace)
   {
     case OHTAColorspace:
     {
diff --git a/MagickCore/option.c b/MagickCore/option.c
index 168c67c35..629d6cfe1 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -699,7 +699,7 @@ static const OptionInfo
     { "-use-pixmap", 1L, NonConvertOptionFlag, MagickFalse },
     { "+verbose", 0L, ImageInfoOptionFlag, MagickFalse },
     { "-verbose", 0L, ImageInfoOptionFlag, MagickFalse },
-    { "+version", 0L, DepreciatedOptionFlag, MagickTrue },
+    { "+version", 0L, DeprecateOptionFlag, MagickTrue },
     { "-version", 1L, SpecialOptionFlag, MagickFalse },
     { "+view", 0L, ImageInfoOptionFlag, MagickFalse },
     { "-view", 1L, ImageInfoOptionFlag, MagickFalse },