(no commit message)

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

diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 5bb0989e0c8305abca8cc90953e060e4d339d62c..a366d9827b6dade2d2c300768e5fa8ff9ce46bcd 100644 (file)
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -685,7 +685,7 @@ MagickExport MagickBooleanType IsImageGray(const Image *image,
   if ((image->type == BilevelType) || (image->type == GrayscaleType) ||
       (image->type == GrayscaleMatteType))
     return(MagickTrue);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     return(MagickFalse);
   type=BilevelType;
   image_view=AcquireCacheView(image);
@@ -769,7 +769,7 @@ MagickExport MagickBooleanType IsImageMonochrome(const Image *image,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (image->type == BilevelType)
     return(MagickTrue);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     return(MagickFalse);
   type=BilevelType;
   image_view=AcquireCacheView(image);

diff --git a/MagickCore/color.c b/MagickCore/color.c
index 3c33287f6ed593ffec546f9116bec657a70a52f7..b49bffec1583fd66c952261c1b5f167a8dc4557b 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -2445,7 +2445,7 @@ MagickExport MagickBooleanType QueryColorname(const Image *image,
     }
   GetColorTuple(&pixel,compliance != SVGCompliance ? MagickTrue : MagickFalse,
     name);
-  if (IsRGBColorspace(pixel.colorspace) == MagickFalse)
+  if (IssRGBColorspace(pixel.colorspace) == MagickFalse)
     return(MagickFalse);
   (void) GetColorInfo("*",exception);
   ResetLinkedListIterator(color_list);

diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index 803bc9890550960b765680a6971193f7fc244184..9276a132f902c2f4ae69e0f103a91a42560c6b64 100644 (file)
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -68,11 +68,11 @@ static inline MagickBooleanType IsGrayColorspace(
   return(MagickFalse);
 }
 
-static inline MagickBooleanType IsRGBColorspace(const ColorspaceType colorspace)
+static inline MagickBooleanType IssRGBColorspace(
+  const ColorspaceType colorspace)
 {
   if ((IsGrayColorspace(colorspace) != MagickFalse) ||
-      (colorspace == RGBColorspace) || (colorspace == sRGBColorspace) ||
-      (colorspace == TransparentColorspace))
+      (colorspace == sRGBColorspace) || (colorspace == TransparentColorspace))
     return(MagickTrue);
   return(MagickFalse);
 }

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index e56c9bb11bce56c2444abc52dfe5e484506bc33e..525845b86a924c76a5cec0bc318be2ad7ec58a36 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -76,25 +76,31 @@ typedef struct _TransformPacket
     z;
 } TransformPacket;
 \f
+/*
+  Forward declarations.
+*/
+static MagickBooleanType
+  TransformsRGBImage(Image *,const ColorspaceType,ExceptionInfo *);
+\f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+     R G B T r a n s f o r m I m a g e                                       %
++     s R G B T r a n s f o r m I m a g e                                     %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  RGBTransformImage() converts the reference image from sRGB to an alternate
+%  sRGBTransformImage() converts the reference image from sRGB to an alternate
 %  colorspace.  The transformation matrices are not the standard ones: the
 %  weights are rescaled to normalized the range of the transformed values to
 %  be [0..QuantumRange].
 %
-%  The format of the RGBTransformImage method is:
+%  The format of the sRGBTransformImage method is:
 %
-%      MagickBooleanType RGBTransformImage(Image *image,
+%      MagickBooleanType sRGBTransformImage(Image *image,
 %        const ColorspaceType colorspace,EsceptionInfo *exception)
 %
 %  A description of each parameter follows:
@@ -179,10 +185,10 @@ static inline void ConvertXYZToLab(const double X,const double Y,const double Z,
     *b+=1.0;
 }
 
-MagickExport MagickBooleanType RGBTransformImage(Image *image,
+static MagickBooleanType sRGBTransformImage(Image *image,
   const ColorspaceType colorspace,ExceptionInfo *exception)
 {
-#define RGBTransformImageTag  "RGBTransform/Image"
+#define sRGBTransformImageTag  "RGBTransform/Image"
 
   CacheView
     *image_view;
@@ -1142,9 +1148,9 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
               proceed;
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-            #pragma omp critical (MagickCore_RGBTransformImage)
+            #pragma omp critical (MagickCore_sRGBTransformImage)
 #endif
-            proceed=SetImageProgress(image,RGBTransformImageTag,progress++,
+            proceed=SetImageProgress(image,sRGBTransformImageTag,progress++,
               image->rows);
             if (proceed == MagickFalse)
               status=MagickFalse;
@@ -1272,14 +1278,14 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
     Convert the reference image from an alternate colorspace to RGB.
   */
   if ((colorspace == sRGBColorspace) || (colorspace == TransparentColorspace))
-    return(TransformRGBImage(image,colorspace,exception));
+    return(TransformsRGBImage(image,colorspace,exception));
   status=MagickTrue;
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    status=TransformRGBImage(image,image->colorspace,exception);
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
+    status=TransformsRGBImage(image,image->colorspace,exception);
   /*
     Convert the reference image from RGB to an alternate colorspace.
   */
-  if (RGBTransformImage(image,colorspace,exception) == MagickFalse)
+  if (sRGBTransformImage(image,colorspace,exception) == MagickFalse)
     status=MagickFalse;
   return(status);
 }
@@ -1289,20 +1295,20 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+     T r a n s f o r m R G B I m a g e                                       %
++     T r a n s f o r m s R G B I m a g e                                     %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  TransformRGBImage() converts the reference image from an alternate
+%  TransformsRGBImage() converts the reference image from an alternate
 %  colorspace to sRGB.  The transformation matrices are not the standard ones:
 %  the weights are rescaled to normalize the range of the transformed values to
 %  be [0..QuantumRange].
 %
-%  The format of the TransformRGBImage method is:
+%  The format of the TransformsRGBImage method is:
 %
-%      MagickBooleanType TransformRGBImage(Image *image,
+%      MagickBooleanType TransformsRGBImage(Image *image,
 %        const ColorspaceType colorspace,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
@@ -1406,13 +1412,13 @@ static inline void ConvertCMYKToRGB(PixelInfo *pixel)
     (QuantumRange-pixel->black)+pixel->black);
 }
 
-MagickExport MagickBooleanType TransformRGBImage(Image *image,
+static MagickBooleanType TransformsRGBImage(Image *image,
   const ColorspaceType colorspace,ExceptionInfo *exception)
 {
 #define D50X  (0.9642)
 #define D50Y  (1.0)
 #define D50Z  (0.8249)
-#define TransformRGBImageTag  "Transform/Image"
+#define TransformsRGBImageTag  "Transform/Image"
 
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   static const float
@@ -2612,9 +2618,9 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
               proceed;
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-            #pragma omp critical (MagickCore_TransformRGBImage)
+            #pragma omp critical (MagickCore_TransformsRGBImage)
 #endif
-            proceed=SetImageProgress(image,TransformRGBImageTag,progress++,
+            proceed=SetImageProgress(image,TransformsRGBImageTag,progress++,
               image->rows);
             if (proceed == MagickFalse)
               status=MagickFalse;

diff --git a/MagickCore/colorspace.h b/MagickCore/colorspace.h
index a02bbca7052986b630a341f73e809b6bc8a20be6..df7869b19de6c29ecbcc3605174788d0dcf7d0b4 100644 (file)
--- a/MagickCore/colorspace.h
+++ b/MagickCore/colorspace.h
@@ -50,10 +50,8 @@ typedef enum
 } ColorspaceType;
 
 extern MagickExport MagickBooleanType
-  RGBTransformImage(Image *,const ColorspaceType,ExceptionInfo *),
   SetImageColorspace(Image *,const ColorspaceType,ExceptionInfo *),
-  TransformImageColorspace(Image *,const ColorspaceType,ExceptionInfo *),
-  TransformRGBImage(Image *,const ColorspaceType,ExceptionInfo *);
+  TransformImageColorspace(Image *,const ColorspaceType,ExceptionInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 9a693583736da4e5fd5b5fe0064461543761dffd..36cdfb6a8d996a9627e6950c4a24599276c3a8b1 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -3189,7 +3189,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
     }
     case PaletteType:
     {
-      if (IsRGBColorspace(image->colorspace) == MagickFalse)
+      if (IssRGBColorspace(image->colorspace) == MagickFalse)
         status=TransformImageColorspace(image,sRGBColorspace,exception);
       if ((image->storage_class == DirectClass) || (image->colors > 256))
         {
@@ -3206,7 +3206,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
       ChannelType
         channel_mask;
 
-      if (IsRGBColorspace(image->colorspace) == MagickFalse)
+      if (IssRGBColorspace(image->colorspace) == MagickFalse)
         status=TransformImageColorspace(image,sRGBColorspace,exception);
       if (image->matte == MagickFalse)
         (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
@@ -3220,7 +3220,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
     }
     case PaletteMatteType:
     {
-      if (IsRGBColorspace(image->colorspace) == MagickFalse)
+      if (IssRGBColorspace(image->colorspace) == MagickFalse)
         status=TransformImageColorspace(image,sRGBColorspace,exception);
       if (image->matte == MagickFalse)
         (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
@@ -3232,7 +3232,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
     }
     case TrueColorType:
     {
-      if (IsRGBColorspace(image->colorspace) == MagickFalse)
+      if (IssRGBColorspace(image->colorspace) == MagickFalse)
         status=TransformImageColorspace(image,sRGBColorspace,exception);
       if (image->storage_class != DirectClass)
         status=SetImageStorageClass(image,DirectClass,exception);
@@ -3241,7 +3241,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
     }
     case TrueColorMatteType:
     {
-      if (IsRGBColorspace(image->colorspace) == MagickFalse)
+      if (IssRGBColorspace(image->colorspace) == MagickFalse)
         status=TransformImageColorspace(image,sRGBColorspace,exception);
       if (image->storage_class != DirectClass)
         status=SetImageStorageClass(image,DirectClass,exception);
@@ -3253,7 +3253,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
     {
       if (image->colorspace != CMYKColorspace)
         {
-          if (IsRGBColorspace(image->colorspace) == MagickFalse)
+          if (IssRGBColorspace(image->colorspace) == MagickFalse)
             status=TransformImageColorspace(image,sRGBColorspace,exception);
           status=TransformImageColorspace(image,CMYKColorspace,exception);
         }
@@ -3266,7 +3266,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
     {
       if (image->colorspace != CMYKColorspace)
         {
-          if (IsRGBColorspace(image->colorspace) == MagickFalse)
+          if (IssRGBColorspace(image->colorspace) == MagickFalse)
             status=TransformImageColorspace(image,sRGBColorspace,exception);
           status=TransformImageColorspace(image,CMYKColorspace,exception);
         }

diff --git a/MagickCore/methods.h b/MagickCore/methods.h
index 83d7523061a06186148404b622737a56c2146cbe..465d78e33215ce6fab5a983e1ac89e1081896c3d 100644 (file)
--- a/MagickCore/methods.h
+++ b/MagickCore/methods.h
@@ -1029,7 +1029,7 @@ extern "C" {
 #define ResourceComponentGenesis  PrependMagickMethod(ResourceComponentGenesis)
 #define ResourceComponentTerminus  PrependMagickMethod(ResourceComponentTerminus)
 #define ReverseImageList  PrependMagickMethod(ReverseImageList)
-#define RGBTransformImage  PrependMagickMethod(RGBTransformImage)
+#define sRGBTransformImage  PrependMagickMethod(sRGBTransformImage)
 #define RollImage  PrependMagickMethod(RollImage)
 #define RotateImage  PrependMagickMethod(RotateImage)
 #define SampleImage  PrependMagickMethod(SampleImage)
@@ -1188,7 +1188,7 @@ extern "C" {
 #define TransformImageColorspace  PrependMagickMethod(TransformImageColorspace)
 #define TransformImage  PrependMagickMethod(TransformImage)
 #define TransformImages  PrependMagickMethod(TransformImages)
-#define TransformRGBImage  PrependMagickMethod(TransformRGBImage)
+#define TransformsRGBImage  PrependMagickMethod(TransformsRGBImage)
 #define TranslateText  PrependMagickMethod(TranslateText)
 #define TransparentImage  PrependMagickMethod(TransparentImage)
 #define TransparentPaintImageChroma  PrependMagickMethod(TransparentPaintImageChroma)

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

diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 0ca9353bc52250c1b80ce12566baf0e23e321494..b69baf2b50863e5a77d4fcd326c5b5d9dd86b1ae 100644 (file)
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -5990,7 +5990,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
                  (source_colorspace != LabColorspace) &&
                  (source_colorspace != XYZColorspace) &&
                  (source_colorspace != YCbCrColorspace) &&
-                 (IsRGBColorspace(image->colorspace) == MagickFalse))
+                 (IssRGBColorspace(image->colorspace) == MagickFalse))
               ThrowProfileException(ImageError,"ColorspaceColorProfileMismatch",
                 name);
             switch (image->rendering_intent)

diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index 6069c3c284fe1e6564896ad4366879ebc5de9ca3..1c657456fad73c797f3799188bbe26d59f23b373 100644 (file)
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -514,7 +514,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info,
       cube_info->quantize_info->colorspace,exception);
   else
     if ((image->colorspace != GRAYColorspace) &&
-        (IsRGBColorspace(image->colorspace) == MagickFalse) &&
+        (IssRGBColorspace(image->colorspace) == MagickFalse) &&
         (image->colorspace != CMYColorspace))
       (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
   if (AcquireImageColormap(image,cube_info->colors,exception) == MagickFalse)
@@ -804,7 +804,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
   else
     if ((image->colorspace != GRAYColorspace) &&
         (image->colorspace != CMYColorspace) &&
-        (IsRGBColorspace(image->colorspace) == MagickFalse))
+        (IssRGBColorspace(image->colorspace) == MagickFalse))
       (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
   midpoint.red=(MagickRealType) QuantumRange/2.0;
   midpoint.green=(MagickRealType) QuantumRange/2.0;

diff --git a/MagickCore/segment.c b/MagickCore/segment.c
index ebdf8b6f4269ea392e2a2f643d251c9187e51186..ca2890ef6e26bb953e7dc65870fc1058177a1e33 100644 (file)
--- a/MagickCore/segment.c
+++ b/MagickCore/segment.c
@@ -1828,7 +1828,7 @@ MagickExport MagickBooleanType SegmentImage(Image *image,
           image->filename)
       }
   }
-  if (IsRGBColorspace(colorspace) == MagickFalse)
+  if (IssRGBColorspace(colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,colorspace,exception);
   /*
     Initialize histogram.
@@ -1845,7 +1845,7 @@ MagickExport MagickBooleanType SegmentImage(Image *image,
   */
   status=Classify(image,extrema,cluster_threshold,WeightingExponent,verbose,
     exception);
-  if (IsRGBColorspace(colorspace) == MagickFalse)
+  if (IssRGBColorspace(colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,colorspace,exception);
   /*
     Relinquish resources.

diff --git a/coders/aai.c b/coders/aai.c
index e61387b64d74bface95390bac766224fe18c52b5..8f589d8d725e07ab578fdfbdabe6e3c7ddfeef4f 100644 (file)
--- a/coders/aai.c
+++ b/coders/aai.c
@@ -364,7 +364,7 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image,
     /*
       Write AAI header.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     (void) WriteBlobLSBLong(image,(unsigned int) image->columns);
     (void) WriteBlobLSBLong(image,(unsigned int) image->rows);

diff --git a/coders/art.c b/coders/art.c
index eafb1290fa02daf554e2cb3bf9ed60cfbaad9bc1..52b8d7be1ac9ccaa9af43dbb80f5cb95f73d80e3 100644 (file)
--- a/coders/art.c
+++ b/coders/art.c
@@ -308,7 +308,7 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image,
     return(status);
   if ((image->columns > 65535UL) || (image->rows > 65535UL))
     ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(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 76a03c9e67132ed1d3c4621c080c9f640c38319a..5a727a6c1ab222834752a7d343a41667a54d1f9b 100644 (file)
--- a/coders/avs.c
+++ b/coders/avs.c
@@ -360,7 +360,7 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image,
     /*
       Write AVS header.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(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 69e75d067b9f61c268e7eef98f78a2bbd2dfbd87..8fcf772f153b9dd11970aed6c36b2ad81ca532e5 100644 (file)
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -1107,7 +1107,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image,
     /*
       Convert MIFF to BGR raster pixels.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(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 9bf12b64579b093183452fe2e47fb540382aa982..3d516eb0af266e934c255b24ac51e45a4e30f08e 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1523,7 +1523,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image,
     /*
       Initialize BMP raster file header.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(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 75a47c511a0203dc44b0457c3a3c78b3f2953dee..04c87eeb6930afab4ee542750299810844eb8d49 100644 (file)
--- a/coders/cip.c
+++ b/coders/cip.c
@@ -235,7 +235,7 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image,
   (void) FormatLocaleString(buffer,MaxTextExtent,"<Depth>2</Depth>\n");
   (void) WriteBlobString(image,buffer);
   (void) WriteBlobString(image,"<Data>");
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(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 47307ba07f174d9f5cd349b9610ba93338a22696..55720fd53564d12889d1290466c7eb9af8f7c805 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -1010,7 +1010,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image,
   /*
     Initialize DIB raster file header.
   */
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   if (image->storage_class == DirectClass)
     {

diff --git a/coders/fax.c b/coders/fax.c
index ecec8b129825e24f9b85814cb365666449835239..f424923cf555debeaf0971a893d7fc9127dece80 100644 (file)
--- a/coders/fax.c
+++ b/coders/fax.c
@@ -330,7 +330,7 @@ static MagickBooleanType WriteFAXImage(const ImageInfo *image_info,Image *image,
     /*
       Convert MIFF to monochrome.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     status=HuffmanEncodeImage(write_info,image,image,exception);
     if (GetNextImageInList(image) == (Image *) NULL)

diff --git a/coders/fits.c b/coders/fits.c
index 47a0f1580597e8d7ce21d8107d66de38d2b83f9e..16428632150d1cbea2fc306693bca178c70b6fe5 100644 (file)
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -636,7 +636,7 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Allocate image memory.

diff --git a/coders/fpx.c b/coders/fpx.c
index 030e6c024e7d7224c969abc36bce736c70feba1f..652428a73cfccb12e93474991a2dac5910d5e091 100644 (file)
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -858,7 +858,7 @@ static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image,
     Initialize FPX toolkit.
   */
   image->depth=8;
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   memory_limit=20000000;
   fpx_status=FPX_SetToolkitMemoryLimit(&memory_limit);

diff --git a/coders/gif.c b/coders/gif.c
index 536cf6362c759ab5ae36fc0f55fcd5bb0f3b46a6..6d36205a5abc3e3e816031e4ceb93eb59ff27d5c 100644 (file)
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -1548,7 +1548,7 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image,
   one=1;
   do
   {
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     opacity=(-1);
     if (IsImageOpaque(image,exception) != MagickFalse)

diff --git a/coders/gray.c b/coders/gray.c
index 5318ce69ecd75bf47cef4554d8a9b31379002fc8..09b89999512972ac5b5c9fd8ba0dba03d1193538 100644 (file)
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -411,7 +411,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info,
     /*
       Write grayscale pixels.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     quantum_type=GrayQuantum;
     quantum_info=AcquireQuantumInfo(image_info,image);

diff --git a/coders/hdr.c b/coders/hdr.c
index 8aa9ee0587ba4683f564a25805c87e93f00863a6..dec816777a53f6b29a660d1e603940f82a5a8674 100644 (file)
--- a/coders/hdr.c
+++ b/coders/hdr.c
@@ -686,7 +686,7 @@ static MagickBooleanType WriteHDRImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Write header.

diff --git a/coders/hrz.c b/coders/hrz.c
index d6331de38e0aaa1bd324b356fc13cb01444a4916..8de807bd506e1cb80a3a62c6612551a8634bd3aa 100644 (file)
--- a/coders/hrz.c
+++ b/coders/hrz.c
@@ -307,7 +307,7 @@ static MagickBooleanType WriteHRZImage(const ImageInfo *image_info,Image *image,
   hrz_image=ResizeImage(image,256,240,image->filter,exception);
   if (hrz_image == (Image *) NULL)
     return(MagickFalse);
-  if (IsRGBColorspace(hrz_image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(hrz_image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(hrz_image,sRGBColorspace,exception);
   /*
     Allocate memory for pixels.

diff --git a/coders/html.c b/coders/html.c
index b51fa3e6bb672766b8b212418cac2af1ad01c30c..527e622b97ac594e545b2f094253892ed495f4f5 100644 (file)
--- a/coders/html.c
+++ b/coders/html.c
@@ -250,7 +250,7 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info,
   if (status == MagickFalse)
     return(status);
   (void) CloseBlob(image);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   *url='\0';
   if ((LocaleCompare(image_info->magick,"FTP") == 0) ||

diff --git a/coders/ipl.c b/coders/ipl.c
index ca5b199d2f626101cfa7b96c25a7242684b2bf64..d734af7960501a6d97e9af4297712932e514f000 100644 (file)
--- a/coders/ipl.c
+++ b/coders/ipl.c
@@ -576,10 +576,10 @@ static MagickBooleanType WriteIPLImage(const ImageInfo *image_info,Image *image,
   ipl_info.width = (unsigned int) image->columns;
   ipl_info.height = (unsigned int) image->rows;
   
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   
-  if(IsRGBColorspace(image->colorspace) == MagickTrue) { ipl_info.colors = 3; }
+  if(IssRGBColorspace(image->colorspace) == MagickTrue) { ipl_info.colors = 3; }
   else{ ipl_info.colors = 1; }
   
   ipl_info.size = (unsigned int) (28 + 

diff --git a/coders/jbig.c b/coders/jbig.c
index 8b5dce9d0e41485781e5cd659026487f96e23094..9d11b8f655b2d4e22bb24f9ecf43cd669db2de75 100644 (file)
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -446,7 +446,7 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info,
     /*
       Allocate pixel data.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     number_packets=(image->columns+7)/8;
     pixels=(unsigned char *) AcquireQuantumMemory(number_packets,

diff --git a/coders/jp2.c b/coders/jp2.c
index 02f09ab5bb05d998663439f1f281cc3a99d20238..6014890d058c8eec116e49a484e4485f8a5f394e 100644 (file)
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -857,7 +857,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
   /*
     Initialize JPEG 2000 API.
   */
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   jp2_stream=JP2StreamManager(image);
   if (jp2_stream == (jas_stream_t *) NULL)

diff --git a/coders/jpeg.c b/coders/jpeg.c
index bc29af4f4798facda3c325809b65c868be8f58b6..31f13c6452b5885474da2343f0979ea63176cfce 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2092,7 +2092,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     }
     default:
     {
-      if (IsRGBColorspace(image->colorspace) == MagickFalse)
+      if (IssRGBColorspace(image->colorspace) == MagickFalse)
         (void) TransformImageColorspace(image,sRGBColorspace,exception);
       break;
     }

diff --git a/coders/map.c b/coders/map.c
index 05720b45c75015ebc58963fbace759b882febf88..a3f8249fb196462a8fcdc534fe45205b1dcb52d2 100644 (file)
--- a/coders/map.c
+++ b/coders/map.c
@@ -375,7 +375,7 @@ static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Allocate colormap.

diff --git a/coders/mat.c b/coders/mat.c
index 33dafbb4940163ee9b8e0d2db127133e8d0b5744..ba48f696a7af6dae845b60c0c9064e302cfa1204 100644 (file)
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -1212,7 +1212,7 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image,
   scene=0;
   do
   {
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
 
     is_gray = IsImageGray(image,exception);

diff --git a/coders/mono.c b/coders/mono.c
index 8d91544e0f284c8b67ac7692df61c877db3593b9..c5d154bbae16307af6f62a685807f3a8cb77b020 100644 (file)
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -313,7 +313,7 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Convert image to a bi-level image.

diff --git a/coders/mtv.c b/coders/mtv.c
index 21bfe22cefa3f7f1735cfad8d559b1780b94a5ad..ac75e53995fb345c06c3601e62f9a9cd2aed7980 100644 (file)
--- a/coders/mtv.c
+++ b/coders/mtv.c
@@ -366,7 +366,7 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image,
     /*
       Allocate memory for pixels.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     pixels=(unsigned char *) AcquireQuantumMemory((size_t) image->columns,
       3UL*sizeof(*pixels));

diff --git a/coders/otb.c b/coders/otb.c
index d9a47013a16501ebb438611a4f8f390508ab5b9b..5f16098fb6c87f9ad36bfc47f32aaa553dfe797e 100644 (file)
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -333,7 +333,7 @@ static MagickBooleanType WriteOTBImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Convert image to a bi-level image.

diff --git a/coders/palm.c b/coders/palm.c
index 35eb0c6f533bc68c68cf6c3821039a9df92f4f93..614485b3a43abec6cee0b59d5731fa75f92f4ce4 100644 (file)
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -732,7 +732,7 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info,
   scene=0;
   do
   {
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     count=GetNumberColors(image,NULL,exception);
     for (bits_per_pixel=1;  (one << bits_per_pixel) < count; bits_per_pixel*=2) ;

diff --git a/coders/pcd.c b/coders/pcd.c
index 654021e9ad85071198ff073838fb0b108faa337b..54b2f5d91797aab39303fd6ced7eac599e2e7ef0 100644 (file)
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -1011,7 +1011,7 @@ static MagickBooleanType WritePCDTile(Image *image,const char *page_geometry,
       tile_image=bordered_image;
     }
   (void) TransformImage(&tile_image,(char *) NULL,tile_geometry,exception);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(tile_image,YCCColorspace,exception);
   downsample_image=ResizeImage(tile_image,tile_image->columns/2,
     tile_image->rows/2,TriangleFilter,exception);
@@ -1099,7 +1099,7 @@ static MagickBooleanType WritePCDImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,pcd_image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(pcd_image,sRGBColorspace,exception);
   /*
     Write PCD image header.

diff --git a/coders/pcl.c b/coders/pcl.c
index ea26914331933172b9df53b5dd4d245f86cf73f4..e4e51746fa12bbf99c44401767632bbe9241a701 100644 (file)
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -721,7 +721,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image,
   one=1;
   do
   {
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     /*
       Initialize the printer.

diff --git a/coders/pcx.c b/coders/pcx.c
index c2a3d214ef95393a5d7ede3b537e0513aaea55c3..c8052cfcf3890969920fd268ab3cd67d99eb73d7 100644 (file)
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -879,7 +879,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   page_table=(MagickOffsetType *) NULL;
   if ((LocaleCompare(image_info->magick,"DCX") == 0) ||

diff --git a/coders/pdb.c b/coders/pdb.c
index 0d8413612044f27f51a279c1281abbba5926dc4e..d1187a9aa76f565c31268a905bebead8fb482b31 100644 (file)
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -743,7 +743,7 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
 
   if (image -> colors <= 2  ||  GetImageType( image, exception ) == BilevelType) { /* TS */
@@ -818,7 +818,7 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image,
     sizeof(*scanline));
   if (scanline == (unsigned char *) NULL)
     ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Convert to GRAY raster scanline.

diff --git a/coders/pdf.c b/coders/pdf.c
index e9a5c74bd82f9e70eaa77d4981abe07c41555f9a..e54342ade73ae7b95374c2db66e3642645fc7376 100644 (file)
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -562,7 +562,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
       page.width=page.height;
       page.height=swap;
     }
-  if (IsRGBColorspace(image_info->colorspace) != MagickFalse)
+  if (IssRGBColorspace(image_info->colorspace) != MagickFalse)
     cmyk=MagickFalse;
   /*
     Create Ghostscript control file.
@@ -1253,7 +1253,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image,
     }
     if (compression == JPEG2000Compression)
       {
-        if (IsRGBColorspace(image->colorspace) == MagickFalse)
+        if (IssRGBColorspace(image->colorspace) == MagickFalse)
           (void) TransformImageColorspace(image,sRGBColorspace,exception);
       }
     /*

diff --git a/coders/pict.c b/coders/pict.c
index e22864f6c69898829eb39e1ee0a638c0647ad449..acad1fe52005e573d8f3a4d16ee671f856b0e0d3 100644 (file)
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -1385,7 +1385,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
         (void) SetImageExtent(image,
           MagickMax(image->columns,tile_image->columns),
           MagickMax(image->rows,tile_image->rows),exception);
-        if (IsRGBColorspace(image->colorspace) == MagickFalse)
+        if (IssRGBColorspace(image->colorspace) == MagickFalse)
           (void) TransformImageColorspace(image,tile_image->colorspace,
             exception);
         (void) CompositeImage(image,tile_image,CopyCompositeOp,MagickTrue,
@@ -1603,7 +1603,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Initialize image info.

diff --git a/coders/png.c b/coders/png.c
index f50177fd63e35fe5693a125de2979487212df16d..9b390474027de662a9cc187857853513dfbcf37d 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -7737,7 +7737,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
         }
     }
 
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
 
   /*

diff --git a/coders/pnm.c b/coders/pnm.c
index 3563f263b9ec6e25a379705c5da732288faedd00..fe9b47b556ceac350d8dd3868748bb5af4cb89ee 100644 (file)
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -1560,7 +1560,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
       }
     if (format != '7')
       {
-        if (IsRGBColorspace(image->colorspace) == MagickFalse)
+        if (IssRGBColorspace(image->colorspace) == MagickFalse)
           (void) TransformImageColorspace(image,sRGBColorspace,exception);
         (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n",
           (double) image->columns,(double) image->rows);

diff --git a/coders/ps.c b/coders/ps.c
index 691f575da7eb0011e813c8bf524fdbf88744b36a..d5f2290f83b4852cdf328f9746d49529b70c23ec 100644 (file)
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -708,7 +708,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
         resolution.y/delta.y)-0.5);
     }
   (void) CloseBlob(image);
-  if (IsRGBColorspace(image_info->colorspace) != MagickFalse)
+  if (IssRGBColorspace(image_info->colorspace) != MagickFalse)
     cmyk=MagickFalse;
   /*
     Create Ghostscript control file.
@@ -1443,7 +1443,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image,
     /*
       Scale relative to dots-per-inch.
     */
-    if ((IsRGBColorspace(image->colorspace) == MagickFalse) &&
+    if ((IssRGBColorspace(image->colorspace) == MagickFalse) &&
         (image->colorspace != CMYKColorspace))
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     delta.x=DefaultResolution;

diff --git a/coders/psd.c b/coders/psd.c
index 4591d3da9a84f271a2f696ef8898589aba471415..4f66b88cf05f33348b01e8aeb24ee2a0c4e68e48 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -703,7 +703,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels,
         }
         case 4:
         {
-          if ((IsRGBColorspace(image->colorspace) == MagickTrue) &&
+          if ((IssRGBColorspace(image->colorspace) == MagickTrue) &&
               (channels > 3))
             break;
           if (image->matte != MagickFalse)
@@ -2175,7 +2175,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image,
            (image->colorspace != CMYKColorspace)) &&
           (image_info->colorspace != CMYKColorspace))
         {
-          if (IsRGBColorspace(image->colorspace) == MagickFalse)
+          if (IssRGBColorspace(image->colorspace) == MagickFalse)
             (void) TransformImageColorspace(image,sRGBColorspace,exception);
           (void) WriteBlobMSBShort(image,(unsigned short)
             (image->storage_class == PseudoClass ? IndexedMode : RGBMode));

diff --git a/coders/rgb.c b/coders/rgb.c
index 09dce873b5dfa0b0f0f585955077e1c0027c4278..e8a72eb3573cc23d4173acf7ac4db09ad83555e1 100644 (file)
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -1128,7 +1128,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,
     /*
       Convert MIFF to RGB raster pixels.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     if ((LocaleCompare(image_info->magick,"RGBA") == 0) &&
         (image->matte == MagickFalse))

diff --git a/coders/sgi.c b/coders/sgi.c
index 1b83a7212db6086af8adc2f00f4ce049afa11dd3..15f346a84015e018dee7c7e3e8d7e4a750c7df3f 100644 (file)
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -907,7 +907,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image,
     /*
       Initialize SGI raster file header.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     (void) ResetMagickMemory(&iris_info,0,sizeof(iris_info));
     iris_info.magic=0x01DA;

diff --git a/coders/sun.c b/coders/sun.c
index 268e444e7e153878f5d6eca9b072a3136491681f..a4c0ff1e0ef7b68ec3e2576559b26ebf30fcddcb 100644 (file)
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -761,7 +761,7 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image,
     /*
       Initialize SUN raster file header.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     sun_info.magic=0x59a66a95;
     if ((image->columns != (unsigned int) image->columns) ||

diff --git a/coders/tga.c b/coders/tga.c
index 7864b91a5dbdee892697db17e125682c7bda775a..b1b6eb8370c291fe49f5b741a260a89a9e05e51a 100644 (file)
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -698,7 +698,7 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image,
   */
   if ((image->columns > 65535L) || (image->rows > 65535L))
     ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   targa_info.id_length=0;
   value=GetImageProperty(image,"comment",exception);

diff --git a/coders/tiff.c b/coders/tiff.c
index 7d7e28c32a9ffbea4e07849fed8a9bdb4228da46..8f96fb531d15481c2b168aa7993f3eaa2ee6154d 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2804,7 +2804,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
             }
           else
             {
-              if (IsRGBColorspace(image->colorspace) == MagickFalse)
+              if (IssRGBColorspace(image->colorspace) == MagickFalse)
                 (void) TransformImageColorspace(image,sRGBColorspace,exception);
               photometric=PHOTOMETRIC_RGB;
             }
@@ -2972,7 +2972,7 @@ 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 (IsRGBColorspace(image->colorspace) == MagickTrue)
+        if (IssRGBColorspace(image->colorspace) == MagickTrue)
           {
             const char
               *value;

diff --git a/coders/uil.c b/coders/uil.c
index 978b465b3519d92c3dfda9025060f764d62550fb..163ec410c34a0d91cdc8269a6c9fa9bee6adb2bd 100644 (file)
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -213,7 +213,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   transparent=MagickFalse;
   i=0;

diff --git a/coders/vicar.c b/coders/vicar.c
index 4dd58e265701806615f5fe5f014cd77ba37b1e8c..855feda1a3b4dd9c789ea14297696e3715f3a9d1 100644 (file)
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -457,7 +457,7 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Write header.

diff --git a/coders/viff.c b/coders/viff.c
index 05368510e64e3d3831e8affc24e5e49681836239..52ff0f902e339d179fe7a5fa53498afdbe1f4874 100644 (file)
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -974,7 +974,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
     /*
       Initialize VIFF image structure.
     */
-    if (IsRGBColorspace(image->colorspace) == MagickFalse)
+    if (IssRGBColorspace(image->colorspace) == MagickFalse)
       (void) TransformImageColorspace(image,sRGBColorspace,exception);
     if (IsImageGray(image,exception) != MagickFalse)
       (void) SetImageStorageClass(image,DirectClass,exception);

diff --git a/coders/wbmp.c b/coders/wbmp.c
index eca3218b52dfe7b1700bbae411d7b8dd87c449cc..8fa4f5c827a617653b94d61aafd19671d3362059 100644 (file)
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -377,7 +377,7 @@ static MagickBooleanType WriteWBMPImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Convert image to a bi-level image.

diff --git a/coders/xbm.c b/coders/xbm.c
index c794764cfba95fb435976aad6f6e572b3c8f1288..3d0877c56899c0bb1791014450f4e08fae8095a1 100644 (file)
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -510,7 +510,7 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Write X bitmap header.

diff --git a/coders/xpm.c b/coders/xpm.c
index 360c7c7907e4c382fbc87153b85e3479c4066861..9df7e0b3cbc41204a385943f33017571d32cae89 100644 (file)
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -631,7 +631,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   SetGeometry(image,&geometry);
   (void) ParseMetaGeometry(PiconGeometry,&geometry.x,&geometry.y,
@@ -878,7 +878,7 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   opacity=(-1);
   if (image->matte == MagickFalse)

diff --git a/coders/xwd.c b/coders/xwd.c
index d1b8a4e939254f785b0bf4fc038967284bcb3d48..89ae9ca247e833e9b1041fe503015f799c58a60b 100644 (file)
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -649,7 +649,7 @@ static MagickBooleanType WriteXWDImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
-  if (IsRGBColorspace(image->colorspace) == MagickFalse)
+  if (IssRGBColorspace(image->colorspace) == MagickFalse)
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Initialize XWD file header.

diff --git a/tests/validate.c b/tests/validate.c
index 23423fdd3de656f7f949d91465c641aca07c8216..ae4a1919a822445d7a2c0724310702a199d1eb62 100644 (file)
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -605,7 +605,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
 #if defined(MAGICKCORE_HDRI_SUPPORT)
       fuzz+=0.003;
 #endif
-      if (IsRGBColorspace(reference_image->colorspace) == MagickFalse)
+      if (IssRGBColorspace(reference_image->colorspace) == MagickFalse)
         fuzz+=0.3;
       fuzz+=MagickEpsilon;
       difference_image=CompareImages(reference_image,reconstruct_image,
@@ -817,7 +817,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
 #if defined(MAGICKCORE_HDRI_SUPPORT)
       fuzz+=0.003;
 #endif
-      if (IsRGBColorspace(reference_image->colorspace) == MagickFalse)
+      if (IssRGBColorspace(reference_image->colorspace) == MagickFalse)
         fuzz+=0.3;
       fuzz+=MagickEpsilon;
       difference_image=CompareImages(reference_image,reconstruct_image,