(no commit message)

diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index 803bc9890550960b765680a6971193f7fc244184..39335b62660397fd6d48a3f4d23040778f3f4f02 100644 (file)
--- 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 707dcb6289f6d7ad04e4e9e41c8e19d98bcdd067..cbc3e4a48e84162cada560840e45bc967f46ec0a 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -77,7 +77,7 @@ typedef struct _TransformPacket
 } TransformPacket;
 \f
 /*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
 %                                                                             %
 %                                                                             %
@@ -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 168c67c358eea4312a12fad8f5a07ecf3741ee10..629d6cfe19175322729016d9a2d3b2434dfd9912 100644 (file)
--- 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 },