From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 16 Apr 2012 21:11:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5783
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c511e881bdb2adc9c87173f8c3a6a747a96dbabd;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 02062dcce..5a2f652f0 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -196,7 +196,7 @@ MagickPrivate Cache AcquirePixelCache(const size_t number_threads)
   (void) ResetMagickMemory(cache_info,0,sizeof(*cache_info));
   cache_info->type=UndefinedCache;
   cache_info->mode=IOMode;
-  cache_info->colorspace=RGBColorspace;
+  cache_info->colorspace=sRGBColorspace;
   cache_info->file=(-1);
   cache_info->id=GetMagickThreadId();
   cache_info->number_threads=number_threads;
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index a2302146d..aea3959f2 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -2464,7 +2464,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
         if (preview_image == (Image *) NULL)
           break;
         threshold+=0.4f;
-        (void) SegmentImage(preview_image,RGBColorspace,MagickFalse,threshold,
+        (void) SegmentImage(preview_image,sRGBColorspace,MagickFalse,threshold,
           threshold,exception);
         (void) FormatLocaleString(label,MaxTextExtent,"segment %gx%g",
           threshold,threshold);
diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 7a886dfcd..0ca9353bc 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -5876,7 +5876,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
               }
               case cmsSigRgbData:
               {
-                source_colorspace=RGBColorspace;
+                source_colorspace=sRGBColorspace;
                 source_type=(cmsUInt32Number) TYPE_RGB_16;
                 source_channels=3;
                 break;
@@ -5938,7 +5938,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
               }
               case cmsSigRgbData:
               {
-                target_colorspace=RGBColorspace;
+                target_colorspace=sRGBColorspace;
                 target_type=(cmsUInt32Number) TYPE_RGB_16;
                 target_channels=3;
                 break;
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index 35f2e53b2..6069c3c28 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -516,7 +516,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info,
     if ((image->colorspace != GRAYColorspace) &&
         (IsRGBColorspace(image->colorspace) == MagickFalse) &&
         (image->colorspace != CMYColorspace))
-      (void) TransformImageColorspace((Image *) image,RGBColorspace,exception);
+      (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
   if (AcquireImageColormap(image,cube_info->colors,exception) == MagickFalse)
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
       image->filename);
@@ -682,7 +682,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info,
   (void) SyncImage(image,exception);
   if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
       (cube_info->quantize_info->colorspace != CMYKColorspace))
-    (void) TransformImageColorspace((Image *) image,RGBColorspace,exception);
+    (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
   return(MagickTrue);
 }
 
@@ -805,7 +805,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
     if ((image->colorspace != GRAYColorspace) &&
         (image->colorspace != CMYColorspace) &&
         (IsRGBColorspace(image->colorspace) == MagickFalse))
-      (void) TransformImageColorspace((Image *) image,RGBColorspace,exception);
+      (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
   midpoint.red=(MagickRealType) QuantumRange/2.0;
   midpoint.green=(MagickRealType) QuantumRange/2.0;
   midpoint.blue=(MagickRealType) QuantumRange/2.0;
@@ -1000,7 +1000,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info,
   image_view=DestroyCacheView(image_view);
   if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
       (cube_info->quantize_info->colorspace != CMYKColorspace))
-    (void) TransformImageColorspace((Image *) image,RGBColorspace,exception);
+    (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
   return(MagickTrue);
 }
 
diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index ad53ca245..30228373c 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -1191,7 +1191,8 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             (void) SyncImageSettings(mogrify_info,*image,exception);
             if (*option == '+')
               {
-                (void) TransformImageColorspace(*image,RGBColorspace,exception);
+                (void) TransformImageColorspace(*image,sRGBColorspace,
+                  exception);
                 break;
               }
             colorspace=(ColorspaceType) ParseCommandOption(
diff --git a/coders/hrz.c b/coders/hrz.c
index cd588cd8f..d6331de38 100644
--- a/coders/hrz.c
+++ b/coders/hrz.c
@@ -308,7 +308,7 @@ static MagickBooleanType WriteHRZImage(const ImageInfo *image_info,Image *image,
   if (hrz_image == (Image *) NULL)
     return(MagickFalse);
   if (IsRGBColorspace(hrz_image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(hrz_image,RGBColorspace,exception);
+    (void) TransformImageColorspace(hrz_image,sRGBColorspace,exception);
   /*
     Allocate memory for pixels.
   */
diff --git a/coders/icon.c b/coders/icon.c
index 63eec997d..35c09aa71 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -913,7 +913,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
           Initialize ICON raster file header.
         */
         if (next->colorspace != RGBColorspace)
-          (void) TransformImageColorspace(next,RGBColorspace,exception);
+          (void) TransformImageColorspace(next,sRGBColorspace,exception);
         icon_info.file_size=14+12+28;
         icon_info.offset_bits=icon_info.file_size;
         icon_info.compression=BI_RGB;
diff --git a/coders/pcd.c b/coders/pcd.c
index ca3e92a14..654021e9a 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -1100,7 +1100,7 @@ static MagickBooleanType WritePCDImage(const ImageInfo *image_info,Image *image,
   if (status == MagickFalse)
     return(status);
   if (IsRGBColorspace(image->colorspace) == MagickFalse)
-    (void) TransformImageColorspace(pcd_image,RGBColorspace,exception);
+    (void) TransformImageColorspace(pcd_image,sRGBColorspace,exception);
   /*
     Write PCD image header.
   */