From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 23 Jun 2012 21:56:40 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5364
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66d261297e560b99169e75a86ce30dc301c69641;p=imagemagick

---

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 68b09427f..020ec11cc 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -5532,6 +5532,8 @@ MagickExport Image *VignetteImage(const Image *image,const double radius,
   blur_image=DestroyImage(blur_image);
   vignette_image=MergeImageLayers(canvas_image,FlattenLayer,exception);
   canvas_image=DestroyImage(canvas_image);
+  if (vignette_image != (Image *) NULL)
+    (void) TransformImageColorspace(vignette_image,image->colorspace,exception);
   return(vignette_image);
 }
 
diff --git a/MagickCore/image.c b/MagickCore/image.c
index 5fbcbd59f..ed30b7362 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2349,8 +2349,8 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image,
   assert(image->signature == MagickSignature);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
-  if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
-      (IsPixelInfoGray(&image->background_color) == MagickFalse))
+  if ((IsPixelInfoGray(&image->background_color) == MagickFalse) &&
+      (IsGrayColorspace(image->colorspace) != MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   if ((image->background_color.matte != MagickFalse) &&
       (image->matte == MagickFalse))