diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index 269ea0b..81ad3b2 100644
--- a/MagickCore/animate.c
+++ b/MagickCore/animate.c
@@ -1929,7 +1929,7 @@
/*
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 5bb0989..a366d98 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -685,7 +685,7 @@
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 @@
(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 3c33287..b49bffe 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -2445,7 +2445,7 @@
}
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 803bc98..9276a13 100644
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -68,11 +68,11 @@
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 e56c9bb..525845b 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -77,24 +77,30 @@
} TransformPacket;
/*
+ Forward declarations.
+*/
+static MagickBooleanType
+ TransformsRGBImage(Image *,const ColorspaceType,ExceptionInfo *);
+
+/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% %
% %
-+ 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 @@
*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 @@
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 @@
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 @@
% %
% %
% %
-+ 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 @@
(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 @@
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 a02bbca..df7869b 100644
--- a/MagickCore/colorspace.h
+++ b/MagickCore/colorspace.h
@@ -50,10 +50,8 @@
} 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 9a69358..36cdfb6 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -3189,7 +3189,7 @@
}
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 @@
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 @@
}
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 @@
}
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 @@
}
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 @@
{
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 @@
{
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 83d7523..465d78e 100644
--- a/MagickCore/methods.h
+++ b/MagickCore/methods.h
@@ -1029,7 +1029,7 @@
#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 @@
#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 f1f977e..b180e66 100644
--- a/MagickCore/nt-feature.c
+++ b/MagickCore/nt-feature.c
@@ -179,7 +179,7 @@
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 0ca9353..b69baf2 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -5990,7 +5990,7 @@
(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 6069c3c..1c65745 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -514,7 +514,7 @@
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 @@
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 ebdf8b6..ca2890e 100644
--- a/MagickCore/segment.c
+++ b/MagickCore/segment.c
@@ -1828,7 +1828,7 @@
image->filename)
}
}
- if (IsRGBColorspace(colorspace) == MagickFalse)
+ if (IssRGBColorspace(colorspace) == MagickFalse)
(void) TransformImageColorspace(image,colorspace,exception);
/*
Initialize histogram.
@@ -1845,7 +1845,7 @@
*/
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 e61387b..8f589d8 100644
--- a/coders/aai.c
+++ b/coders/aai.c
@@ -364,7 +364,7 @@
/*
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 eafb129..52b8d7b 100644
--- a/coders/art.c
+++ b/coders/art.c
@@ -308,7 +308,7 @@
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 76a03c9..5a727a6 100644
--- a/coders/avs.c
+++ b/coders/avs.c
@@ -360,7 +360,7 @@
/*
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 69e75d0..8fcf772 100644
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -1107,7 +1107,7 @@
/*
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 9bf12b6..3d516eb 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1523,7 +1523,7 @@
/*
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 75a47c5..04c87ee 100644
--- a/coders/cip.c
+++ b/coders/cip.c
@@ -235,7 +235,7 @@
(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 47307ba..55720fd 100644
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -1010,7 +1010,7 @@
/*
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 ecec8b1..f424923 100644
--- a/coders/fax.c
+++ b/coders/fax.c
@@ -330,7 +330,7 @@
/*
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 47a0f15..1642863 100644
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -636,7 +636,7 @@
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 030e6c0..652428a 100644
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -858,7 +858,7 @@
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 536cf63..6d36205 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -1548,7 +1548,7 @@
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 5318ce6..09b8999 100644
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -411,7 +411,7 @@
/*
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 8aa9ee0..dec8167 100644
--- a/coders/hdr.c
+++ b/coders/hdr.c
@@ -686,7 +686,7 @@
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 d6331de..8de807b 100644
--- a/coders/hrz.c
+++ b/coders/hrz.c
@@ -307,7 +307,7 @@
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 b51fa3e..527e622 100644
--- a/coders/html.c
+++ b/coders/html.c
@@ -250,7 +250,7 @@
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 ca5b199..d734af7 100644
--- a/coders/ipl.c
+++ b/coders/ipl.c
@@ -576,10 +576,10 @@
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 8b5dce9..9d11b8f 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -446,7 +446,7 @@
/*
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 02f09ab..6014890 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -857,7 +857,7 @@
/*
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 bc29af4..31f13c6 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2092,7 +2092,7 @@
}
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 05720b4..a3f8249 100644
--- a/coders/map.c
+++ b/coders/map.c
@@ -375,7 +375,7 @@
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 33dafbb..ba48f69 100644
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -1212,7 +1212,7 @@
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 8d91544..c5d154b 100644
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -313,7 +313,7 @@
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 21bfe22..ac75e53 100644
--- a/coders/mtv.c
+++ b/coders/mtv.c
@@ -366,7 +366,7 @@
/*
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 d9a4701..5f16098 100644
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -333,7 +333,7 @@
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 35eb0c6..614485b 100644
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -732,7 +732,7 @@
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 654021e..54b2f5d 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -1011,7 +1011,7 @@
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 @@
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 ea26914..e4e5174 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -721,7 +721,7 @@
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 c2a3d21..c8052cf 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -879,7 +879,7 @@
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 0d84136..d1187a9 100644
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -743,7 +743,7 @@
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 @@
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 e9a5c74..e54342a 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -562,7 +562,7 @@
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 @@
}
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 e22864f..acad1fe 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -1385,7 +1385,7 @@
(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 @@
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 f50177f..9b39047 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -7737,7 +7737,7 @@
}
}
- 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 3563f26..fe9b47b 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -1560,7 +1560,7 @@
}
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 691f575..d5f2290 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -708,7 +708,7 @@
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 @@
/*
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 4591d3d..4f66b88 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -703,7 +703,7 @@
}
case 4:
{
- if ((IsRGBColorspace(image->colorspace) == MagickTrue) &&
+ if ((IssRGBColorspace(image->colorspace) == MagickTrue) &&
(channels > 3))
break;
if (image->matte != MagickFalse)
@@ -2175,7 +2175,7 @@
(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 09dce87..e8a72eb 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -1128,7 +1128,7 @@
/*
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 1b83a72..15f346a 100644
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -907,7 +907,7 @@
/*
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 268e444..a4c0ff1 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -761,7 +761,7 @@
/*
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 7864b91..b1b6eb8 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -698,7 +698,7 @@
*/
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 7d7e28c..8f96fb5 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2804,7 +2804,7 @@
}
else
{
- if (IsRGBColorspace(image->colorspace) == MagickFalse)
+ if (IssRGBColorspace(image->colorspace) == MagickFalse)
(void) TransformImageColorspace(image,sRGBColorspace,exception);
photometric=PHOTOMETRIC_RGB;
}
@@ -2972,7 +2972,7 @@
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 978b465..163ec41 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -213,7 +213,7 @@
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 4dd58e2..855feda 100644
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -457,7 +457,7 @@
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 0536851..52ff0f9 100644
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -974,7 +974,7 @@
/*
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 eca3218..8fa4f5c 100644
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -377,7 +377,7 @@
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 c794764..3d0877c 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -510,7 +510,7 @@
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 360c7c7..9df7e0b 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -631,7 +631,7 @@
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 @@
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 d1b8a4e..89ae9ca 100644
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -649,7 +649,7 @@
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 23423fd..ae4a191 100644
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -605,7 +605,7 @@
#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 @@
#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,