From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 18 Apr 2012 12:58:34 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5777
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7020ae6594690c03a4f73784fd41a7131a5b22c6;p=imagemagick

---

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index de89a86a2..fe1da2b67 100644
--- 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 d4ef0e52d..9d736ba10 100644
--- 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 e833b97af..9a5a14d8c 100644
--- 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 c44e3d687..cf7067e30 100644
--- 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();
 }
 
diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 4be0781c1..68af30525 100644
--- 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 8fcf772f1..9864e71cf 100644
--- 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 e2e417e89..0738159d0 100644
--- 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 d734af796..7a8559b2b 100644
--- 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 e35aa378f..0ba831804 100644
--- 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 e8a72eb35..d3c733406 100644
--- 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 163ec410c..23f4b5da6 100644
--- 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 598ddad23..e78ca4b5c 100644
--- 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 9df7e0b3c..c50eee8c4 100644
--- 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);