From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 11 Jul 2012 12:04:31 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5277
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b09db11cc8fa61710ac2bc9c46c06733c39d67b7;p=imagemagick

---

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 9deb05648..25c6decdc 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -292,7 +292,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
-    (void) TransformImageColorspace(image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(image,RGBColorspace,exception);
   status=MagickTrue;
   for (i=0; textlist[i] != (char *) NULL; i++)
   {
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 2b528ebd4..a210b6547 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -4972,7 +4972,7 @@ MagickPrivate VirtualPixelMethod SetPixelCacheVirtualMethod(Image *image,
           (void) SetCacheAlphaChannel(image,OpaqueAlpha,exception);
         if ((IsPixelInfoGray(&image->background_color) == MagickFalse) &&
             (IsGrayColorspace(image->colorspace) != MagickFalse))
-          (void) TransformImageColorspace(image,sRGBColorspace,exception);
+          (void) TransformImageColorspace(image,RGBColorspace,exception);
         break;
       }
       case TransparentVirtualPixelMethod:
diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index bd808a156..65f5af16e 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -240,7 +240,7 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression,
   if (destination_image == (Image *) NULL)
     return((Image *) NULL);
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
-    (void) TransformImageColorspace((Image *) image,sRGBColorspace,exception);
+    (void) TransformImageColorspace((Image *) image,RGBColorspace,exception);
   if (expression == (const char *) NULL)
     return(destination_image);
   destination_channel=RedPixelChannel;
@@ -291,7 +291,7 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression,
             return(destination_image);
           }
         if (IsGrayColorspace(canvas->colorspace) != MagickFalse)
-          (void) TransformImageColorspace(canvas,sRGBColorspace,exception);
+          (void) TransformImageColorspace(canvas,RGBColorspace,exception);
         AppendImageToList(&destination_image,canvas);
         destination_image=GetLastImageInList(destination_image);
         GetMagickToken(p,&p,token);
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 09fb02522..ec602f432 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -2364,7 +2364,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture,
   if (texture_image == (const Image *) NULL)
     return(MagickFalse);
   if (IsGrayColorspace(texture_image->colorspace) != MagickFalse)
-    (void) TransformImageColorspace(texture_image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(texture_image,RGBColorspace,exception);
   (void) SetImageVirtualPixelMethod(texture_image,TileVirtualPixelMethod,
     exception);
   status=MagickTrue;
diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index c2988c688..7e1104ec5 100644
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -232,7 +232,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
     }
   if ((IsPixelInfoGray(&frame_image->matte_color) == MagickFalse) &&
       (IsGrayColorspace(frame_image->colorspace) != MagickFalse))
-    (void) SetImageColorspace(frame_image,sRGBColorspace,exception);
+    (void) SetImageColorspace(frame_image,RGBColorspace,exception);
   if ((frame_image->matte_color.matte != MagickFalse) &&
       (frame_image->matte == MagickFalse))
     (void) SetImageAlpha(frame_image,OpaqueAlpha,exception);
diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 78874ad0e..190f2c531 100644
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -2282,7 +2282,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
     }
   if ((IsPixelInfoGray(&distort_image->background_color) == MagickFalse) &&
       (IsGrayColorspace(distort_image->colorspace) != MagickFalse))
-    (void) TransformImageColorspace(distort_image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(distort_image,RGBColorspace,exception);
   if (distort_image->background_color.matte != MagickFalse)
     distort_image->matte=MagickTrue;
   distort_image->page.x=geometry.x;
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 0e74a9df8..e12cadd35 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -4166,7 +4166,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
   if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
       ((IsPixelInfoGray(&draw_info->fill) == MagickFalse) ||
        (IsPixelInfoGray(&draw_info->stroke) == MagickFalse)))
-    (void) SetImageColorspace(image,sRGBColorspace,exception);
+    (void) SetImageColorspace(image,RGBColorspace,exception);
   status=MagickTrue;
   x=(ssize_t) ceil(primitive_info->point.x-0.5);
   y=(ssize_t) ceil(primitive_info->point.y-0.5);
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index cae107b3b..34026ddb2 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -330,7 +330,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
-    (void) TransformImageColorspace(image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(image,RGBColorspace,exception);
   clut_map=(PixelInfo *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*clut_map));
   if (clut_map == (PixelInfo *) NULL)
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
@@ -2022,7 +2022,7 @@ MagickExport MagickBooleanType HaldClutImage(Image *image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
-    (void) TransformImageColorspace(image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(image,RGBColorspace,exception);
   if (image->matte == MagickFalse)
     (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
   /*
@@ -2386,7 +2386,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
-    (void) SetImageColorspace(image,sRGBColorspace,exception);
+    (void) SetImageColorspace(image,RGBColorspace,exception);
   if (image->storage_class == PseudoClass)
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
     #pragma omp parallel for schedule(static,4) shared(progress,status) \
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index b9d1429b0..c74623f53 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -302,7 +302,7 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type,
       return((Image *) NULL);
     }
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
-    (void) TransformImageColorspace(noise_image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(noise_image,RGBColorspace,exception);
   /*
     Add noise in each row.
   */
@@ -709,7 +709,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
     }
   if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
       (IsPixelInfoGray(colorize) != MagickFalse))
-    (void) SetImageColorspace(colorize_image,sRGBColorspace,exception);
+    (void) SetImageColorspace(colorize_image,RGBColorspace,exception);
   if ((colorize_image->matte == MagickFalse) &&
       (colorize->matte != MagickFalse))
     (void) SetImageAlpha(colorize_image,OpaqueAlpha,exception);
@@ -4292,7 +4292,7 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha,
   if (clone_image == (Image *) NULL)
     return((Image *) NULL);
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
-    (void) TransformImageColorspace(clone_image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(clone_image,RGBColorspace,exception);
   (void) SetImageVirtualPixelMethod(clone_image,TransparentVirtualPixelMethod,
     exception);
   border_info.width=(size_t) floor(2.0*sigma+0.5);
@@ -5293,7 +5293,7 @@ MagickExport Image *TintImage(const Image *image,const char *blend,
     }
   if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
       (IsPixelInfoGray(tint) == MagickFalse))
-    (void) SetImageColorspace(tint_image,sRGBColorspace,exception);
+    (void) SetImageColorspace(tint_image,RGBColorspace,exception);
   if (blend == (const char *) NULL)
     return(tint_image);
   /*
diff --git a/MagickCore/image.c b/MagickCore/image.c
index ed30b7362..af1dbb9a7 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2351,7 +2351,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image,
     return(MagickFalse);
   if ((IsPixelInfoGray(&image->background_color) == MagickFalse) &&
       (IsGrayColorspace(image->colorspace) != MagickFalse))
-    (void) TransformImageColorspace(image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(image,RGBColorspace,exception);
   if ((image->background_color.matte != MagickFalse) &&
       (image->matte == MagickFalse))
     (void) SetImageAlpha(image,OpaqueAlpha,exception);
diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index c992cf894..3a91b0c5b 100644
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -173,7 +173,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
-    (void) TransformImageColorspace(image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(image,RGBColorspace,exception);
   if ((image->matte == MagickFalse) && (draw_info->fill.matte != MagickFalse))
     (void) SetImageAlpha(image,OpaqueAlpha,exception);
   /*
@@ -780,7 +780,7 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image,
     return(MagickFalse);
   if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
       (IsPixelInfoGray(fill) != MagickFalse))
-    (void) TransformImageColorspace(image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(image,RGBColorspace,exception);
   if ((fill->matte != MagickFalse) && (image->matte == MagickFalse))
     (void) SetImageAlpha(image,OpaqueAlpha,exception);
   /*
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 5da971962..33c394e4c 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -527,7 +527,7 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
-    (void) TransformImageColorspace(image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(image,RGBColorspace,exception);
   GetPixelInfo(image,&threshold);
   flags=ParseGeometry(thresholds,&geometry_info);
   threshold.red=geometry_info.rho;
@@ -1660,7 +1660,7 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
-    (void) TransformImageColorspace(image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(image,RGBColorspace,exception);
   GetPixelInfo(image,&threshold);
   flags=ParseGeometry(thresholds,&geometry_info);
   threshold.red=geometry_info.rho;