(no commit message)

diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index 68c6332cdac9b7a9846f35064bc56c3754f0801d..26cb0c74137808e8fbd51f89677f8f8b9fa8e775 100644 (file)
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -1929,7 +1929,8 @@ MagickExport Image *XAnimateImages(Display *display,
     /*
       Create X image.
     */
-    if (IssRGBColorspace(image_list[scene]->colorspace) == MagickFalse)
+    if ((IssRGBColorspace(image_list[scene]->colorspace) == MagickFalse) &&
+        (IsGrayColorspace(image_list[scene]->colorspace) == MagickFalse))
       (void) TransformImageColorspace(image_list[scene],sRGBColorspace,
         exception);
     windows->image.pixmap=(Pixmap) NULL;

diff --git a/MagickCore/nt-feature.c b/MagickCore/nt-feature.c
index d7cc8bc8a6bd9ff13397ddb8bd07fce8bce3d02a..209dd578dcff1d94dbfd5dfb779748df28717904 100644 (file)
--- a/MagickCore/nt-feature.c
+++ b/MagickCore/nt-feature.c
@@ -179,7 +179,8 @@ MagickExport void *CropImageToHBITMAP(Image *image,
   bitmap_bits=(RGBQUAD *) GlobalLock((HGLOBAL) bitmap_bitsH);
   if ( bitmap.bmBits == NULL )
     bitmap.bmBits = bitmap_bits;
-  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsGrayColorspace(image->colorspace) == MagickFalse))
     TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Extract crop image.

diff --git a/MagickCore/segment.c b/MagickCore/segment.c
index 0734cbffe65b2e8180c85d79d2e656481dd89d88..e7a05faef4c939dbe8cbe20bf40e9f9377b61cc5 100644 (file)
--- a/MagickCore/segment.c
+++ b/MagickCore/segment.c
@@ -1832,7 +1832,8 @@ MagickExport MagickBooleanType SegmentImage(Image *image,
           image->filename)
       }
   }
-  if (IssRGBColorspace(colorspace) == MagickFalse)
+  if ((IssRGBColorspace(colorspace) == MagickFalse) &&
+      (IsGRAYColorspace(colorspace) == MagickFalse))
     (void) TransformImageColorspace(image,colorspace,exception);
   /*
     Initialize histogram.
@@ -1849,7 +1850,8 @@ MagickExport MagickBooleanType SegmentImage(Image *image,
   */
   status=Classify(image,extrema,cluster_threshold,WeightingExponent,verbose,
     exception);
-  if (IssRGBColorspace(colorspace) == MagickFalse)
+  if ((IssRGBColorspace(colorspace) == MagickFalse) &&
+      (IsGRAYColorspace(colorspace) == MagickFalse))
     (void) TransformImageColorspace(image,colorspace,exception);
   /*
     Relinquish resources.