From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 13 Mar 2013 00:34:24 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=400275a0d76ca33c44fc4d661ccd68999d7ba7d9;p=imagemagick

---

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index b42fd6b3a..970bc055b 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -2978,8 +2978,6 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray,
         shade_image=DestroyImage(shade_image);
       return((Image *) NULL);
     }
-  if (image->colorspace == sRGBColorspace)
-    (void) TransformImageColorspace(linear_image,RGBColorspace,exception);
   if (SetImageStorageClass(shade_image,DirectClass,exception) == MagickFalse)
     {
       linear_image=DestroyImage(linear_image);
@@ -3133,8 +3131,6 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray,
   shade_view=DestroyCacheView(shade_view);
   image_view=DestroyCacheView(image_view);
   linear_image=DestroyImage(linear_image);
-  if (image->colorspace == sRGBColorspace)
-    (void) TransformImageColorspace(shade_image,sRGBColorspace,exception);
   if (status == MagickFalse)
     shade_image=DestroyImage(shade_image);
   return(shade_image);
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 112c7b11b..7c8919ebb 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -998,9 +998,6 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
   CacheView
     *image_view;
 
-  ColorspaceType
-    colorspace;
-
   MagickBooleanType
     status;
 
@@ -1052,9 +1049,6 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
   /*
     Form histogram.
   */
-  colorspace=image->colorspace;
-  if (colorspace == sRGBColorspace)
-    (void) SetImageColorspace(image,RGBColorspace,exception);
   status=MagickTrue;
   (void) ResetMagickMemory(histogram,0,(MaxMap+1)*GetPixelChannels(image)*
     sizeof(*histogram));
@@ -1254,8 +1248,6 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
           status=MagickFalse;
       }
   }
-  if (colorspace == sRGBColorspace)
-    (void) SetImageColorspace(image,sRGBColorspace,exception);
   image_view=DestroyCacheView(image_view);
   stretch_map=(double *) RelinquishMagickMemory(stretch_map);
   white=(double *) RelinquishMagickMemory(white);
diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index e81c41c09..c0821819b 100644
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -174,7 +174,8 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
     return(MagickFalse);
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
     (void) TransformImageColorspace(image,RGBColorspace,exception);
-  if ((image->alpha_trait != BlendPixelTrait) && (draw_info->fill.alpha_trait == BlendPixelTrait))
+  if ((image->alpha_trait != BlendPixelTrait) &&
+      (draw_info->fill.alpha_trait == BlendPixelTrait))
     (void) SetImageAlpha(image,OpaqueAlpha,exception);
   /*
     Set floodfill state.
@@ -577,8 +578,6 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
         linear_image=DestroyImage(paint_image);
       return((Image *) NULL);
     }
-  if (image->colorspace == sRGBColorspace)
-    (void) TransformImageColorspace(linear_image,sRGBColorspace,exception);
   if (SetImageStorageClass(paint_image,DirectClass,exception) == MagickFalse)
     {
       linear_image=DestroyImage(linear_image);
@@ -708,8 +707,6 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
   image_view=DestroyCacheView(image_view);
   histograms=DestroyHistogramThreadSet(histograms);
   linear_image=DestroyImage(linear_image);
-  if (image->colorspace == sRGBColorspace)
-    (void) TransformImageColorspace(paint_image,sRGBColorspace,exception);
   if (status == MagickFalse)
     paint_image=DestroyImage(paint_image);
   return(paint_image);
@@ -786,7 +783,8 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image,
   if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
       (IsPixelInfoGray(fill) == MagickFalse))
     (void) TransformImageColorspace(image,RGBColorspace,exception);
-  if ((fill->alpha_trait == BlendPixelTrait) && (image->alpha_trait != BlendPixelTrait))
+  if ((fill->alpha_trait == BlendPixelTrait) &&
+      (image->alpha_trait != BlendPixelTrait))
     (void) SetImageAlpha(image,OpaqueAlpha,exception);
   /*
     Make image color opaque.