(no commit message)

diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index 39335b62660397fd6d48a3f4d23040778f3f4f02..09b0cf4a43b932234d1dc88f54766a0825cfc261 100644 (file)
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -71,7 +71,7 @@ static inline MagickBooleanType IsGrayColorspace(
 static inline MagickBooleanType IsRGBColorspace(const ColorspaceType colorspace)
 {
   if ((IsGrayColorspace(colorspace) != MagickFalse) ||
-      (colorspace == RGBColorspace) || (colorspace == TransparentColorspace))
+      (colorspace == sRGBColorspace) || (colorspace == TransparentColorspace))
     return(MagickTrue);
   return(MagickFalse);
 }

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 1d89dfd792fdf0e996c62488ae7498d6ac412450..59dc79115e0441e88015a3b067ed5c0a8de5a5e8 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -172,7 +172,7 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info,
   (void) CopyMagickString(image->magick,"MIFF",MaxTextExtent);
   image->storage_class=DirectClass;
   image->depth=MAGICKCORE_QUANTUM_DEPTH;
-  image->colorspace=RGBColorspace;
+  image->colorspace=sRGBColorspace;
   image->interlace=NoInterlace;
   image->ticks_per_second=UndefinedTicksPerSecond;
   image->compose=OverCompositeOp;
@@ -3565,7 +3565,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
     case PaletteType:
     {
       if (IsRGBColorspace(image->colorspace) == MagickFalse)
-        status=TransformImageColorspace(image,RGBColorspace,exception);
+        status=TransformImageColorspace(image,sRGBColorspace,exception);
       if ((image->storage_class == DirectClass) || (image->colors > 256))
         {
           quantize_info=AcquireQuantizeInfo(image_info);
@@ -3582,7 +3582,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
         channel_mask;
 
       if (IsRGBColorspace(image->colorspace) == MagickFalse)
-        status=TransformImageColorspace(image,RGBColorspace,exception);
+        status=TransformImageColorspace(image,sRGBColorspace,exception);
       if (image->matte == MagickFalse)
         (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       channel_mask=SetPixelChannelMask(image,AlphaChannel);
@@ -3596,7 +3596,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
     case PaletteMatteType:
     {
       if (IsRGBColorspace(image->colorspace) == MagickFalse)
-        status=TransformImageColorspace(image,RGBColorspace,exception);
+        status=TransformImageColorspace(image,sRGBColorspace,exception);
       if (image->matte == MagickFalse)
         (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       quantize_info=AcquireQuantizeInfo(image_info);
@@ -3608,7 +3608,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
     case TrueColorType:
     {
       if (IsRGBColorspace(image->colorspace) == MagickFalse)
-        status=TransformImageColorspace(image,RGBColorspace,exception);
+        status=TransformImageColorspace(image,sRGBColorspace,exception);
       if (image->storage_class != DirectClass)
         status=SetImageStorageClass(image,DirectClass,exception);
       image->matte=MagickFalse;
@@ -3617,7 +3617,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
     case TrueColorMatteType:
     {
       if (IsRGBColorspace(image->colorspace) == MagickFalse)
-        status=TransformImageColorspace(image,RGBColorspace,exception);
+        status=TransformImageColorspace(image,sRGBColorspace,exception);
       if (image->storage_class != DirectClass)
         status=SetImageStorageClass(image,DirectClass,exception);
       if (image->matte == MagickFalse)
@@ -3629,7 +3629,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
       if (image->colorspace != CMYKColorspace)
         {
           if (IsRGBColorspace(image->colorspace) == MagickFalse)
-            status=TransformImageColorspace(image,RGBColorspace,exception);
+            status=TransformImageColorspace(image,sRGBColorspace,exception);
           status=TransformImageColorspace(image,CMYKColorspace,exception);
         }
       if (image->storage_class != DirectClass)
@@ -3642,7 +3642,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
       if (image->colorspace != CMYKColorspace)
         {
           if (IsRGBColorspace(image->colorspace) == MagickFalse)
-            status=TransformImageColorspace(image,RGBColorspace,exception);
+            status=TransformImageColorspace(image,sRGBColorspace,exception);
           status=TransformImageColorspace(image,CMYKColorspace,exception);
         }
       if (image->storage_class != DirectClass)

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index 6299beec31d432fb9d968bbcc7027f351e8d3dae..63c0fbf5bc74e788d32b01703dae53321cf49bf5 100644 (file)
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -216,7 +216,7 @@ MagickExport void *CropImageToHBITMAP(Image *image,
   if ( bitmap.bmBits == NULL )
     bitmap.bmBits = bitmap_bits;
   if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    TransformImageColorspace(image,RGBColorspace,exception);
+    TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Extract crop image.
   */
@@ -560,7 +560,7 @@ MagickExport void *ImageToHBITMAP(Image *image,ExceptionInfo *exception)
   q=bitmap_bits;
   if (bitmap.bmBits == NULL)
     bitmap.bmBits=bitmap_bits;
-  (void) TransformImageColorspace(image,RGBColorspace,exception);
+  (void) TransformImageColorspace(image,sRGBColorspace,exception);
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     p=GetVirtualPixels(image,0,y,image->columns,1,exception);

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index c4596d61569889011fb1c1dd01544b9e3d92701b..e084f9768b50be427c6aa13514ca3112c08ab48c 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -54,6 +54,7 @@
 #include "MagickCore/monitor-private.h"
 #include "MagickCore/thread-private.h"
 #include "MagickCore/string-private.h"
+#if 0
 \f
 /*
   Define declarations.
@@ -4056,3 +4057,4 @@ WandExport void WandListOperatorImages(MagickWand *wand,const char *option,
 #undef exception
 #undef normal_op
 }
+#endif

diff --git a/coders/aai.c b/coders/aai.c
index 9a6f6a8503dafbc44dd43d0bde56d127eae064de..e61387b64d74bface95390bac766224fe18c52b5 100644 (file)
--- a/coders/aai.c
+++ b/coders/aai.c
@@ -365,7 +365,7 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image,
       Write AAI header.
     */
     if (IsRGBColorspace(image->colorspace) == MagickFalse)
-      (void) TransformImageColorspace(image,RGBColorspace,exception);
+      (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 3dbc9afd971bd4d15c07e7803e2253f47b333f21..eafb1290fa02daf554e2cb3bf9ed60cfbaad9bc1 100644 (file)
--- a/coders/art.c
+++ b/coders/art.c
@@ -309,7 +309,7 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image,
   if ((image->columns > 65535UL) || (image->rows > 65535UL))
     ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
   if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(image,RGBColorspace,exception);
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   (void) SetImageType(image,BilevelType,exception);
   image->endian=MSBEndian;
   image->depth=1;

diff --git a/coders/avs.c b/coders/avs.c
index 37644f7a1f40f3b92062e2b160f3d0c8770d005e..76a03c9e67132ed1d3c4621c080c9f640c38319a 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 (IsRGBColorspace(image->colorspace) == MagickFalse)
-      (void) TransformImageColorspace(image,RGBColorspace,exception);
+      (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 40c70b9694bbb809a5f69750a58c8858a5313d83..69e75d067b9f61c268e7eef98f78a2bbd2dfbd87 100644 (file)
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -1108,7 +1108,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image,
       Convert MIFF to BGR raster pixels.
     */
     if (IsRGBColorspace(image->colorspace) == MagickFalse)
-      (void) TransformImageColorspace(image,RGBColorspace,exception);
+      (void) TransformImageColorspace(image,sRGBColorspace,exception);
     if ((LocaleCompare(image_info->magick,"BGRA") == 0) &&
         (image->matte == MagickFalse))
       (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);

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

diff --git a/coders/cip.c b/coders/cip.c
index cfcfb9174639053493e7e1bf9e923ec007a70a89..75a47c511a0203dc44b0457c3a3c78b3f2953dee 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 (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(image,RGBColorspace,exception);
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   for (y=0; y < (ssize_t) image->rows; y++)
   {
     p=GetVirtualPixels(image,0,y,image->columns,1,exception);

diff --git a/coders/dib.c b/coders/dib.c
index 085215e9b69e903a2d13307f554ddc222f45602a..47307ba07f174d9f5cd349b9610ba93338a22696 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 (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(image,RGBColorspace,exception);
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   if (image->storage_class == DirectClass)
     {
       /*

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

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

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

diff --git a/coders/gif.c b/coders/gif.c
index 3a1fd7753746dcdaa86755c535b925cbf46af1fc..55977ec8a9d24ee6edc81309447d5486b96759ca 100644 (file)
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -1220,7 +1220,6 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception)
       Read image attributes.
     */
     image->storage_class=PseudoClass;
-    image->colorspace=sRGBColorspace;
     image->compression=LZWCompression;
     page.x=(ssize_t) ReadBlobLSBShort(image);
     page.y=(ssize_t) ReadBlobLSBShort(image);
@@ -1564,7 +1563,7 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image,
   do
   {
     if (IsRGBColorspace(image->colorspace) == MagickFalse)
-      (void) TransformImageColorspace(image,RGBColorspace,exception);
+      (void) TransformImageColorspace(image,sRGBColorspace,exception);
     opacity=(-1);
     if (IsImageOpaque(image,exception) != MagickFalse)
       {

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

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

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

diff --git a/coders/ipl.c b/coders/ipl.c
index 806cd0731050b16fd33eb72455d0859c21e65f4c..ca5b199d2f626101cfa7b96c25a7242684b2bf64 100644 (file)
--- a/coders/ipl.c
+++ b/coders/ipl.c
@@ -577,7 +577,7 @@ static MagickBooleanType WriteIPLImage(const ImageInfo *image_info,Image *image,
   ipl_info.height = (unsigned int) image->rows;
   
   if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(image,RGBColorspace,exception);
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   
   if(IsRGBColorspace(image->colorspace) == MagickTrue) { ipl_info.colors = 3; }
   else{ ipl_info.colors = 1; }

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

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

diff --git a/coders/jpeg.c b/coders/jpeg.c
index b49a4e4e4b0770eb2734ba4b60fc2a2d35134225..9198db371a5f41867f23c69711faec2156bdbb00 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1052,8 +1052,6 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
   else
     if (jpeg_info.out_color_space == JCS_CMYK)
       image->colorspace=CMYKColorspace;
-    else
-      image->colorspace=sRGBColorspace;
   /*
     Set image resolution.
   */
@@ -1862,7 +1860,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     default:
     {
       if (IsRGBColorspace(image->colorspace) == MagickFalse)
-        (void) TransformImageColorspace(image,RGBColorspace,exception);
+        (void) TransformImageColorspace(image,sRGBColorspace,exception);
       break;
     }
   }

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

diff --git a/coders/mat.c b/coders/mat.c
index 15a604e841653f29a2aea395dc864929be3e6118..33dafbb4940163ee9b8e0d2db127133e8d0b5744 100644 (file)
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -1213,7 +1213,7 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image,
   do
   {
     if (IsRGBColorspace(image->colorspace) == MagickFalse)
-      (void) TransformImageColorspace(image,RGBColorspace,exception);
+      (void) TransformImageColorspace(image,sRGBColorspace,exception);
 
     is_gray = IsImageGray(image,exception);
     z = is_gray ? 0 : 3;

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

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

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

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

diff --git a/coders/pcl.c b/coders/pcl.c
index 39a0b478e1fb0793f49d395355a1009d9544bc46..269786472862d1309ec7a393afe93a2aad559b73 100644 (file)
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -722,7 +722,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image,
   do
   {
     if (IsRGBColorspace(image->colorspace) == MagickFalse)
-      (void) TransformImageColorspace(image,RGBColorspace,exception);
+      (void) TransformImageColorspace(image,sRGBColorspace,exception);
     /*
       Initialize the printer.
     */

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

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

diff --git a/coders/pdf.c b/coders/pdf.c
index f90d6da7806b613ec586f2b62fb1b28e1f23de84..2e5f2fc092f9c4e1f9ec7a1c1769e5945feb7f29 100644 (file)
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -1258,7 +1258,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image,
     if (compression == JPEG2000Compression)
       {
         if (IsRGBColorspace(image->colorspace) == MagickFalse)
-          (void) TransformImageColorspace(image,RGBColorspace,exception);
+          (void) TransformImageColorspace(image,sRGBColorspace,exception);
       }
     /*
       Scale relative to dots-per-inch.

diff --git a/coders/pict.c b/coders/pict.c
index 418e3d54a02ff0c842756f6f3bd859e581ac4182..36224e0faba55bed076f4ec0bc77b0daa8cc6fa3 100644 (file)
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -1604,7 +1604,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info,
   if (status == MagickFalse)
     return(status);
   if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(image,RGBColorspace,exception);
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   /*
     Initialize image info.
   */

diff --git a/coders/png.c b/coders/png.c
index fa709897bd23ae4f4341656ff835b2edd6b11d7f..0877d5db292e3435fbd365aec590e4a069b1ec16 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -2342,14 +2342,12 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
   {
     if (mng_info->have_global_srgb)
       {
-        image->colorspace=sRGBColorspace;
         image->rendering_intent=Magick_RenderingIntent_from_PNG_RenderingIntent
           (mng_info->global_srgb_intent);
       }
 
     if (png_get_sRGB(ping,ping_info,&intent))
       {
-        image->colorspace=sRGBColorspace;
         image->rendering_intent=Magick_RenderingIntent_from_PNG_RenderingIntent
           (intent);
 
@@ -3577,7 +3575,6 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
 #if defined(PNG_sRGB_SUPPORTED)
      if (png_get_valid(ping,ping_info,PNG_INFO_sRGB))
        {
-         image->colorspace=sRGBColorspace;
          (void) FormatLocaleString(msg,MaxTextExtent,
             "intent=%d (See Rendering intent)", (int) intent);
          (void) SetImageProperty(image,"png:sRGB                 ",msg,
@@ -4238,7 +4235,6 @@ static Image *ReadOneJNGImage(MngInfo *mng_info,
       {
         if (length == 1)
           {
-            image->colorspace=sRGBColorspace;
             image->rendering_intent=
               Magick_RenderingIntent_from_PNG_RenderingIntent(p[0]);
             image->gamma=0.45455f;
@@ -7777,7 +7773,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
     }
 
   if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(image,RGBColorspace,exception);
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
 
   /*
     Sometimes we get PseudoClass images whose RGB values don't match

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

diff --git a/coders/ps.c b/coders/ps.c
index 09294209fa73f9c0567f0e8bacb6ac14075919ff..7e0f454dbdb5d162070a081bc02d843aebe712da 100644 (file)
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -1448,7 +1448,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image,
     */
     if ((IsRGBColorspace(image->colorspace) == MagickFalse) &&
         (image->colorspace != CMYKColorspace))
-      (void) TransformImageColorspace(image,RGBColorspace,exception);
+      (void) TransformImageColorspace(image,sRGBColorspace,exception);
     delta.x=DefaultResolution;
     delta.y=DefaultResolution;
     resolution.x=image->resolution.x;

diff --git a/coders/psd.c b/coders/psd.c
index 8f83c5c0c4b6044cb6d24c7aed02bd97fbc6846e..02d7ce02bd3e077393fccd7c205ddcf7d75ff0b9 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -2176,7 +2176,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image,
           (image_info->colorspace != CMYKColorspace))
         {
           if (IsRGBColorspace(image->colorspace) == MagickFalse)
-            (void) TransformImageColorspace(image,RGBColorspace,exception);
+            (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 0ab2a35895fd04a72e0aa748870f9d24c63ee769..09dce873b5dfa0b0f0f585955077e1c0027c4278 100644 (file)
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -1129,7 +1129,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,
       Convert MIFF to RGB raster pixels.
     */
     if (IsRGBColorspace(image->colorspace) == MagickFalse)
-      (void) TransformImageColorspace(image,RGBColorspace,exception);
+      (void) TransformImageColorspace(image,sRGBColorspace,exception);
     if ((LocaleCompare(image_info->magick,"RGBA") == 0) &&
         (image->matte == MagickFalse))
       (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);

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

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

diff --git a/coders/tga.c b/coders/tga.c
index 692393fc261372ceb612aaef2ec2491e85937d56..7864b91a5dbdee892697db17e125682c7bda775a 100644 (file)
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -699,7 +699,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)
-    (void) TransformImageColorspace(image,RGBColorspace,exception);
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   targa_info.id_length=0;
   value=GetImageProperty(image,"comment",exception);
   if (value != (const char *) NULL)

diff --git a/coders/tiff.c b/coders/tiff.c
index 795a9754ff3bb8ee537b7422d4ab24eaa4d906b2..a4cdd0612d36fbe71c29c16e8988c1aa0a1d70e6 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2806,7 +2806,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
           else
             {
               if (IsRGBColorspace(image->colorspace) == MagickFalse)
-                (void) TransformImageColorspace(image,RGBColorspace,exception);
+                (void) TransformImageColorspace(image,sRGBColorspace,exception);
               photometric=PHOTOMETRIC_RGB;
             }
         (void) TIFFSetField(tiff,TIFFTAG_SAMPLESPERPIXEL,3);

diff --git a/coders/uil.c b/coders/uil.c
index 2d3fa83705d188820984138562ef30ef164c07ab..978b465b3519d92c3dfda9025060f764d62550fb 100644 (file)
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -214,7 +214,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
   if (status == MagickFalse)
     return(status);
   if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(image,RGBColorspace,exception);
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   transparent=MagickFalse;
   i=0;
   p=(const Quantum *) NULL;

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

diff --git a/coders/viff.c b/coders/viff.c
index 8e1391341f0e4815385ccb35330623ba8b01ee85..05368510e64e3d3831e8affc24e5e49681836239 100644 (file)
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -975,7 +975,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info,
       Initialize VIFF image structure.
     */
     if (IsRGBColorspace(image->colorspace) == MagickFalse)
-      (void) TransformImageColorspace(image,RGBColorspace,exception);
+      (void) TransformImageColorspace(image,sRGBColorspace,exception);
     if (IsImageGray(image,exception) != MagickFalse)
       (void) SetImageStorageClass(image,DirectClass,exception);
     viff_info.identifier=(char) 0xab;

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

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

diff --git a/coders/xpm.c b/coders/xpm.c
index 32394f105c5f95f2fe693392c5fa136ba048f254..b4fdbdc1f23ec6590ed1bb45798ae45aa2f01cc3 100644 (file)
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -632,7 +632,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
   if (status == MagickFalse)
     return(status);
   if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(image,RGBColorspace,exception);
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   SetGeometry(image,&geometry);
   (void) ParseMetaGeometry(PiconGeometry,&geometry.x,&geometry.y,
     &geometry.width,&geometry.height);
@@ -879,7 +879,7 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image,
   if (status == MagickFalse)
     return(status);
   if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(image,RGBColorspace,exception);
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   opacity=(-1);
   if (image->matte == MagickFalse)
     {

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