(no commit message)

diff --git a/coders/art.c b/coders/art.c
index 9cd9b51a11656c7fa7deaf3d0a61da4ea584045a..677f2fa16d7020186573dd497c21ac9634534c15 100644 (file)
--- a/coders/art.c
+++ b/coders/art.c
@@ -310,7 +310,7 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image,
   if ((image->columns > 65535UL) || (image->rows > 65535UL))
     ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
   if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
-      (IssRGBColorspace(image->colorspace) == MagickFalse))
+      (IsRGBColorspace(image->colorspace) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   (void) SetImageType(image,BilevelType,exception);
   image->endian=MSBEndian;

diff --git a/coders/avs.c b/coders/avs.c
index bd5217cbeb28eb8b2a622c380b50262391151af5..5d8a8aa1b81105edd054d53db13d09c32a2c8b89 100644 (file)
--- a/coders/avs.c
+++ b/coders/avs.c
@@ -361,7 +361,7 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image,
       Write AVS header.
     */
     if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
-        (IssRGBColorspace(image->colorspace) == MagickFalse))
+        (IsRGBColorspace(image->colorspace) == MagickFalse))
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     (void) WriteBlobMSBLong(image,(unsigned int) image->columns);
     (void) WriteBlobMSBLong(image,(unsigned int) image->rows);

diff --git a/coders/bgr.c b/coders/bgr.c
index e0fad915b6a267b01cbf07b60f3b3335390c69f0..5f9cd81ed42181b148d3b6f87694b2bb75dbb3b9 100644 (file)
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -1106,7 +1106,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image,
       Convert MIFF to BGR raster pixels.
     */
     if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
-        (IssRGBColorspace(image->colorspace) == MagickFalse))
+        (IsRGBColorspace(image->colorspace) == MagickFalse))
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     if ((LocaleCompare(image_info->magick,"BGRA") == 0) &&
         (image->matte == MagickFalse))

diff --git a/coders/bmp.c b/coders/bmp.c
index db8074f04b3a3b51ee93c98bb66eaa389a509494..e738fe361700aa9407e5f38aadec1b992dfc177b 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1524,7 +1524,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image,
       Initialize BMP raster file header.
     */
     if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
-        (IssRGBColorspace(image->colorspace) == MagickFalse))
+        (IsRGBColorspace(image->colorspace) == MagickFalse))
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     (void) ResetMagickMemory(&bmp_info,0,sizeof(bmp_info));
     bmp_info.file_size=14+12;

diff --git a/coders/cip.c b/coders/cip.c
index d199484db77136df8250ae5b6778c62afd60fa2f..df1164505e0f777482f9d2c9e52f176ea07cc3b1 100644 (file)
--- a/coders/cip.c
+++ b/coders/cip.c
@@ -236,7 +236,7 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image,
   (void) WriteBlobString(image,buffer);
   (void) WriteBlobString(image,"<Data>");
   if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
-      (IssRGBColorspace(image->colorspace) == MagickFalse))
+      (IsRGBColorspace(image->colorspace) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   for (y=0; y < (ssize_t) image->rows; y++)
   {

diff --git a/coders/dib.c b/coders/dib.c
index f91da64ae091a97da27a0f526e1182ea70ff9bae..c0325ec8a42c5517694fe7b64f7a3c1df3336759 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -1011,7 +1011,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image,
     Initialize DIB raster file header.
   */
   if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
-      (IssRGBColorspace(image->colorspace) == MagickFalse))
+      (IsRGBColorspace(image->colorspace) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   if (image->storage_class == DirectClass)
     {

diff --git a/coders/png.c b/coders/png.c
index b7a50651c0744c9b309c0ff62378f682d998acae..14e032f96a63c1ca2540453f442d2cc131dc24b2 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -8265,8 +8265,9 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
      if (mng_info->write_png_colortype != 7) /* We won't need this info */
        {
          ping_have_color=MagickFalse;
-         if ((IsGrayColorspace(image->colorspace) == MagickFalse) &&
-             (IsRGBColorspace(image->colorspace) == MagickFalse))
+         if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+             (IsRGBColorspace(image->colorspace) == MagickFalse) &&
+             (IsGrayColorspace(image->colorspace) == MagickFalse))
            ping_have_color=MagickTrue;
          ping_have_non_bw=MagickFalse;
 

diff --git a/coders/psd.c b/coders/psd.c
index a59aae55df3cffc43c6b1555378825dc3d0a3589..03059ca30d8bb2e4ca9ac1fca683eba22e657c98 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -703,8 +703,8 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels,
         }
         case 4:
         {
-          if ((IssRGBColorspace(image->colorspace) != MagickFalse) &&
-              (IsRGBColorspace(image->colorspace) != MagickFalse) &&
+          if (((IssRGBColorspace(image->colorspace) != MagickFalse) ||
+               (IsRGBColorspace(image->colorspace) != MagickFalse)) &&
               (channels > 3))
             break;
           if (image->matte != MagickFalse)

diff --git a/coders/tiff.c b/coders/tiff.c
index e29364c7116d3f78e34f59c450e154d960b38967..70410fb19e9c2151bf9c83790f24deb39ee051ad 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2972,7 +2972,8 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
         if (image_info->quality != UndefinedCompressionQuality)
           (void) TIFFSetField(tiff,TIFFTAG_JPEGQUALITY,image_info->quality);
         (void) TIFFSetField(tiff,TIFFTAG_JPEGCOLORMODE,JPEGCOLORMODE_RAW);
-        if (IssRGBColorspace(image->colorspace) == MagickTrue)
+        if ((IssRGBColorspace(image->colorspace) != MagickFalse) ||
+            (IsRGBColorspace(image->colorspace) != MagickFalse))
           {
             const char
               *value;

diff --git a/coders/xpm.c b/coders/xpm.c
index 1f95dc4febf365356bcf3653e6b305c08934a9be..fe91d7d8b1f5c080c7fd649b7f375d6e4fe1b404 100644 (file)
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -879,7 +879,8 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+  if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
+      (IsRGBColorspace(image->colorspace) == MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   opacity=(-1);
   if (image->matte == MagickFalse)