(no commit message)

diff --git a/magick/deprecate.c b/magick/deprecate.c
index db8323d08493f962692cd686ea886b7d45a4dc54..a6db1699be34e008ad862cd9b542a414c1ab2537 100644 (file)
--- a/magick/deprecate.c
+++ b/magick/deprecate.c
@@ -5956,7 +5956,10 @@ MagickExport void SetImage(Image *image,const Quantum opacity)
         if (q == (PixelPacket *) NULL)
           break;
         for (x=0; x < (ssize_t) image->columns; x++)
-          *q++=background_color;
+        {
+          SetRGBAPixelComponent(q,&background_color);
+          q++;
+        }
         indexes=GetAuthenticIndexQueue(image);
         for (x=0; x < (ssize_t) image->columns; x++)
           SetIndexPixelComponent(indexes+x,0);
@@ -5980,7 +5983,10 @@ MagickExport void SetImage(Image *image,const Quantum opacity)
     if (q == (PixelPacket *) NULL)
       break;
     for (x=0; x < (ssize_t) image->columns; x++)
-      *q++=background_color;
+    {
+      SetRGBAPixelComponent(q,&background_color);
+      q++;
+    }
     if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
       break;
   }

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