(no commit message)

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index de89a86a22ab8955b2d5f8c25e721bfabbd5e49d..fe1da2b671c25a18b16b6248501e8ccda174bb98 100644 (file)
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -239,7 +239,7 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression,
   if (destination_image == (Image *) NULL)
     return((Image *) NULL);
   if (destination_image->colorspace == GRAYColorspace)
-    destination_image->colorspace=RGBColorspace;
+    destination_image->colorspace=sRGBColorspace;
   if (expression == (const char *) NULL)
     return(destination_image);
   destination_channel=RedPixelChannel;
@@ -290,7 +290,7 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression,
             return(destination_image);
           }
         if (canvas->colorspace == GRAYColorspace)
-          canvas->colorspace=RGBColorspace;
+          canvas->colorspace=sRGBColorspace;
         AppendImageToList(&destination_image,canvas);
         destination_image=GetLastImageInList(destination_image);
         GetMagickToken(p,&p,token);

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index d4ef0e52d038c042f95c95917a43f99fc0e217b2..9d736ba10110a2649fd724c1c29fb5e68a30bcd9 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -1973,7 +1973,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
 MagickExport void GetPixelInfo(const Image *image,PixelInfo *pixel)
 {
   pixel->storage_class=DirectClass;
-  pixel->colorspace=RGBColorspace;
+  pixel->colorspace=sRGBColorspace;
   pixel->matte=MagickFalse;
   pixel->fuzz=0.0;
   pixel->depth=MAGICKCORE_QUANTUM_DEPTH;

diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c
index e833b97af76b4e3ab76bcb87913c3ffbc53864f1..9a5a14d8ca898e29d175199dbc50c10a7ac1452d 100644 (file)
--- a/MagickWand/drawing-wand.c
+++ b/MagickWand/drawing-wand.c
@@ -400,7 +400,7 @@ static void MvgAppendColor(DrawingWand *wand,const PixelInfo *packet)
         pixel;
 
       GetPixelInfo(wand->image,&pixel);
-      pixel.colorspace=RGBColorspace;
+      pixel.colorspace=sRGBColorspace;
       pixel.matte=packet->alpha != OpaqueAlpha ? MagickTrue : MagickFalse;
       pixel.red=(MagickRealType) packet->red;
       pixel.green=(MagickRealType) packet->green;

diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c
index c44e3d687fa131c940eca7719f48e3ae3523f1e1..cf7067e30e35c772bc1f162a7c9aecaf60bd8477 100644 (file)
--- a/MagickWand/pixel-wand.c
+++ b/MagickWand/pixel-wand.c
@@ -113,7 +113,7 @@ WandExport void ClearPixelWand(PixelWand *wand)
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   ClearMagickException(wand->exception);
-  wand->pixel.colorspace=RGBColorspace;
+  wand->pixel.colorspace=sRGBColorspace;
   wand->debug=IsEventLogging();
 }
 \f

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 4be0781c185e5beb10bfc11498b9230a2a7cf5fb..68af3052537759759f3a85600a90d84d40739dc5 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -9115,7 +9115,7 @@ Mogrify(ref,...)
 
           cluster_threshold=1.0;
           smoothing_threshold=1.5;
-          colorspace=RGBColorspace;
+          colorspace=sRGBColorspace;
           verbose=MagickFalse;
           if (attribute_flag[0] != 0)
             {

diff --git a/coders/bgr.c b/coders/bgr.c
index 8fcf772f153b9dd11970aed6c36b2ad81ca532e5..9864e71cf28f8249225bedf8ed7698a0e0ceb008 100644 (file)
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -141,7 +141,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
   image=AcquireImage(image_info,exception);
   if ((image->columns == 0) || (image->rows == 0))
     ThrowReaderException(OptionError,"MustSpecifyImageSize");
-  image->colorspace=RGBColorspace;
+  image->colorspace=sRGBColorspace;
   if (image_info->interlace != PartitionInterlace)
     {
       status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
@@ -197,7 +197,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
     if ((image_info->ping != MagickFalse) && (image_info->number_scenes != 0))
       if (image->scene >= (image_info->scene+image_info->number_scenes-1))
         break;
-    image->colorspace=RGBColorspace;
+    image->colorspace=sRGBColorspace;
     switch (image_info->interlace)
     {
       case NoInterlace:

diff --git a/coders/dpx.c b/coders/dpx.c
index e2e417e89b8925f0cf3add016a1580b53c47ecb0..0738159d01b4bbad7dd0c8f3345c679c9ef816d5 100644 (file)
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1051,12 +1051,12 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
     }
     case LumaComponentType:
     {
-      image->colorspace=RGBColorspace;
+      image->colorspace=sRGBColorspace;
       break;
     }
     default:
     {
-      image->colorspace=RGBColorspace;
+      image->colorspace=sRGBColorspace;
       if (dpx.image.image_element[0].transfer == LogarithmicColorimetric)
         image->colorspace=LogColorspace;
       if (dpx.image.image_element[0].transfer == PrintingDensityColorimetric)

diff --git a/coders/ipl.c b/coders/ipl.c
index d734af7960501a6d97e9af4297712932e514f000..7a8559b2b54aaba3697adefd048affc7a4a11c0e 100644 (file)
--- a/coders/ipl.c
+++ b/coders/ipl.c
@@ -246,7 +246,7 @@ static Image *ReadIPLImage(const ImageInfo *image_info,ExceptionInfo *exception)
   if((ipl_info.width == 0UL) || (ipl_info.height == 0UL))
     ThrowReaderException(CorruptImageError,"ImproperImageHeader");
   ipl_info.colors=ReadBlobLong(image); 
-  if(ipl_info.colors == 3){ image->colorspace=RGBColorspace;}
+  if(ipl_info.colors == 3){ image->colorspace=sRGBColorspace;}
   else { image->colorspace = GRAYColorspace; }
   ipl_info.z=ReadBlobLong(image); 
   ipl_info.time=ReadBlobLong(image); 

diff --git a/coders/msl.c b/coders/msl.c
index e35aa378f6f2e352cf82cc167ed1aa457df13d9f..0ba83180481f2987d8d43d741d847f0a85735293 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -5898,7 +5898,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
             }
           geometry_info.rho=1.0;
           geometry_info.sigma=1.5;
-          colorspace=RGBColorspace;
+          colorspace=sRGBColorspace;
           verbose=MagickFalse;
           if (attributes != (const xmlChar **) NULL)
             for (i=0; (attributes[i] != (const xmlChar *) NULL); i++)

diff --git a/coders/rgb.c b/coders/rgb.c
index e8a72eb3573cc23d4173acf7ac4db09ad83555e1..d3c733406821da59c287ec0f7a5454c6df381825 100644 (file)
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -141,7 +141,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
   image=AcquireImage(image_info,exception);
   if ((image->columns == 0) || (image->rows == 0))
     ThrowReaderException(OptionError,"MustSpecifyImageSize");
-  image->colorspace=RGBColorspace;
+  image->colorspace=sRGBColorspace;
   if (image_info->interlace != PartitionInterlace)
     {
       status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
@@ -202,7 +202,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
     if ((image_info->ping != MagickFalse) && (image_info->number_scenes != 0))
       if (image->scene >= (image_info->scene+image_info->number_scenes-1))
         break;
-    image->colorspace=RGBColorspace;
+    image->colorspace=sRGBColorspace;
     switch (image_info->interlace)
     {
       case NoInterlace:

diff --git a/coders/uil.c b/coders/uil.c
index 163ec410c34a0d91cdc8269a6c9fa9bee6adb2bd..23f4b5da6b88f379467afe3239240c9939484f43 100644 (file)
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -304,7 +304,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
       Define UIL color.
     */
     pixel=image->colormap[i];
-    pixel.colorspace=RGBColorspace;
+    pixel.colorspace=sRGBColorspace;
     pixel.depth=8;
     pixel.alpha=(MagickRealType) OpaqueAlpha;
     GetColorTuple(&pixel,MagickTrue,name);

diff --git a/coders/xcf.c b/coders/xcf.c
index 598ddad231bd6471ad25b957b8db7720e1786fb7..e78ca4b5c3b036a2d79878e6ed4d975ec116494c 100644 (file)
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -1055,7 +1055,7 @@ static Image *ReadXCFImage(const ImageInfo *image_info,ExceptionInfo *exception)
   image->compression=NoCompression;
   image->depth=8;
   if (image_type == GIMP_RGB)
-    image->colorspace=RGBColorspace;
+    image->colorspace=sRGBColorspace;
   else
     if (image_type == GIMP_GRAY)
       image->colorspace=GRAYColorspace;

diff --git a/coders/xpm.c b/coders/xpm.c
index 9df7e0b3cbc41204a385943f33017571d32cae89..c50eee8c479837cef9a3c4db26200e82dfbf75b3 100644 (file)
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -738,7 +738,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
       Define XPM color.
     */
     pixel=picon->colormap[i];
-    pixel.colorspace=RGBColorspace;
+    pixel.colorspace=sRGBColorspace;
     pixel.depth=8;
     pixel.alpha=(MagickRealType) OpaqueAlpha;
     (void) QueryColorname(image,&pixel,XPMCompliance,name,exception);
@@ -974,7 +974,7 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image,
       Define XPM color.
     */
     pixel=image->colormap[i];
-    pixel.colorspace=RGBColorspace;
+    pixel.colorspace=sRGBColorspace;
     pixel.depth=8;
     pixel.alpha=(MagickRealType) OpaqueAlpha;
     (void) QueryColorname(image,&pixel,XPMCompliance,name,exception);