(no commit message)

diff --git a/magick/deprecate.c b/magick/deprecate.c
index a6db1699be34e008ad862cd9b542a414c1ab2537..703ded2724a8fb1c0655725d0cd470c99875861c 100644 (file)
--- a/magick/deprecate.c
+++ b/magick/deprecate.c
@@ -5957,7 +5957,7 @@ MagickExport void SetImage(Image *image,const Quantum opacity)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
         {
-          SetRGBAPixelComponent(q,&background_color);
+          SetRGBOPixelComponent(q,&background_color);
           q++;
         }
         indexes=GetAuthenticIndexQueue(image);
@@ -5984,7 +5984,7 @@ MagickExport void SetImage(Image *image,const Quantum opacity)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      SetRGBAPixelComponent(q,&background_color);
+      SetRGBOPixelComponent(q,&background_color);
       q++;
     }
     if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)

diff --git a/magick/pixel.h b/magick/pixel.h
index e8cd80929f035dc77498af151abb43aa2d0a337d..294d76caab3345f38713b33fd990e07da71a7d5f 100644 (file)
--- a/magick/pixel.h
+++ b/magick/pixel.h
@@ -60,7 +60,20 @@ extern "C" {
 #define SetOpacityPixelComponent(pixel,value) \
   ((pixel)->opacity=(Quantum) (value))
 #define SetRedPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
+#define SetRGBPixelComponent(destination,source) \
+{ \
+  SetRedPixelComponent(destination,GetRedPixelComponent(source)); \
+  SetGreenPixelComponent(destination,GetGreenPixelComponent(source)); \
+  SetBluePixelComponent(destination,GetBluePixelComponent(source)); \
+}
 #define SetRGBAPixelComponent(destination,source) \
+{ \
+  SetRedPixelComponent(destination,GetRedPixelComponent(source)); \
+  SetGreenPixelComponent(destination,GetGreenPixelComponent(source)); \
+  SetBluePixelComponent(destination,GetBluePixelComponent(source)); \
+  SetAlphaPixelComponent(destination,GetAlphaPixelComponent(source)); \
+}
+#define SetRGBOPixelComponent(destination,source) \
 { \
   SetRedPixelComponent(destination,GetRedPixelComponent(source)); \
   SetGreenPixelComponent(destination,GetGreenPixelComponent(source)); \

diff --git a/magick/xwindow.c b/magick/xwindow.c
index a3e70ccdd4ba5d518da1ff6d103e693752c69662..61de0a9fef477a2c06f84aa9510233c4025ddab2 100644 (file)
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -4458,7 +4458,7 @@ static Image *XGetWindowImage(Display *display,const Window window,
               {
                 index=(IndexPacket) XGetPixel(ximage,x,y);
                 SetIndexPixelComponent(indexes+x,index);
-                SetRGBAPixelComponent(q,composite_image->colormap+index);
+                SetRGBOPixelComponent(q,composite_image->colormap+index);
                 q++;
               }
               if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)