From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 31 Jan 2012 12:49:17 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48438f651727c3b833254bcb9f8212b7aaee56c1;p=imagemagick

---

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 68da8bac8..63e29f174 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1262,7 +1262,7 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
   if (image->colorspace == colorspace)
     return(MagickTrue);
   if ((colorspace == RGBColorspace) || (colorspace == TransparentColorspace))
-    return(TransformRGBImage(image,image->colorspace,exception));
+    return(TransformRGBImage(image,colorspace,exception));
   status=MagickTrue;
   if ((image->colorspace != RGBColorspace) &&
       (image->colorspace != TransparentColorspace) &&
@@ -1669,9 +1669,13 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
   switch (colorspace)
   {
     case GRAYColorspace:
+    case RGBColorspace:
+    {
+      image->colorspace=colorspace;
+      return(MagickTrue);
+    }
     case Rec601LumaColorspace:
     case Rec709LumaColorspace:
-    case RGBColorspace:
     case TransparentColorspace:
     case UndefinedColorspace:
       return(MagickTrue);
diff --git a/MagickCore/image.c b/MagickCore/image.c
index 3a71f22fd..e4e0747a4 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2600,7 +2600,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
         y;
 
       /*
-        Flatten image pixels over the background pixels.
+        Remove transparency.
       */
       if (image->matte == MagickFalse)
         break;
@@ -2638,6 +2638,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
           status=MagickFalse;
       }
       image_view=DestroyCacheView(image_view);
+      image->matte=image->background_color.matte;
       return(status);
     }
     case SetAlphaChannel: