(no commit message)

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 68da8bac86e289b1b5886309206faeea0c915d29..63e29f174635d1f6aa06e47b14918fcfa3248903 100644 (file)
--- 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 3a71f22fd65a2af286270167a9f5d31c59fc637f..e4e0747a4e33ced259093b48b6c4233b35c60186 100644 (file)
--- 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: