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

---

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index 65f5af16e..d2d67e7ee 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -552,28 +552,28 @@ MagickExport Image *CombineImages(const Image *image,
       q=pixels;
       for (x=0; x < (ssize_t) combine_image->columns; x++)
       {
-        if (x < (ssize_t) image->columns)
+        if (x < (ssize_t) next->columns)
           {
-            q[i]=GetPixelGray(image,p);
-            p+=GetPixelChannels(image);
+            q[i]=GetPixelGray(next,p);
+            p+=GetPixelChannels(next);
           }
         q+=GetPixelChannels(combine_image);
       }
       image_view=DestroyCacheView(image_view);
       next=GetNextImageInList(next);
-      if (SyncCacheViewAuthenticPixels(combine_view,exception) == MagickFalse)
-        status=MagickFalse;
-      if (image->progress_monitor != (MagickProgressMonitor) NULL)
-        {
-          MagickBooleanType
-            proceed;
-
-          proceed=SetImageProgress(image,CombineImageTag,progress++,
-            combine_image->rows);
-          if (proceed == MagickFalse)
-            status=MagickFalse;
-        }
     }
+    if (SyncCacheViewAuthenticPixels(combine_view,exception) == MagickFalse)
+      status=MagickFalse;
+    if (image->progress_monitor != (MagickProgressMonitor) NULL)
+      {
+        MagickBooleanType
+          proceed;
+
+        proceed=SetImageProgress(image,CombineImageTag,progress++,
+          combine_image->rows);
+        if (proceed == MagickFalse)
+          status=MagickFalse;
+      }
   }
   combine_view=DestroyCacheView(combine_view);
   if (status == MagickFalse)