From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 7 Jan 2012 16:30:09 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6440
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47e6cd286c60d7b8a6e9f3a82d0005b74259a533;p=imagemagick

---

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 5fe997b1d..27278be4b 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2580,9 +2580,6 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image,
   MagickBooleanType
     status;
 
-  PixelInfo
-    pixel;
-
   ssize_t
     y;
 
@@ -2592,14 +2589,10 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image,
   assert(image->signature == MagickSignature);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
-  if (image->background_color.alpha != OpaqueAlpha)
-    image->matte=MagickTrue;
   /*
     Set image background color.
   */
   status=MagickTrue;
-  pixel=image->background_color;
-  pixel.black=0;
   image_view=AcquireCacheView(image);
   for (y=0; y < (ssize_t) image->rows; y++)
   {
@@ -2619,7 +2612,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetPixelInfoPixel(image,&pixel,q);
+      SetPixelInfoPixel(image,&image->background_color,q);
       q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
diff --git a/MagickCore/layer.c b/MagickCore/layer.c
index d404da179..c7750c170 100644
--- a/MagickCore/layer.c
+++ b/MagickCore/layer.c
@@ -271,9 +271,6 @@ MagickExport Image *CoalesceImages(const Image *image,ExceptionInfo *exception)
     return((Image *) NULL);
   coalesce_image->page=bounds;
   coalesce_image->dispose=NoneDispose;
-  coalesce_image->matte=MagickTrue;
-  coalesce_image->background_color.matte=MagickTrue;
-  coalesce_image->background_color.alpha=(Quantum) TransparentAlpha;
   (void) SetImageBackgroundColor(coalesce_image,exception);
   /*
     Coalesce rest of the images.