Iterate channels over source image rather than destination (bug report from Hanno...

diff --git a/ChangeLog b/ChangeLog
index a9ad23f10362ebf1c9d394f6ae992305143335d0..a04df7d44fece84efb9c18364e84312b3b069868 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-05-10  7.0.1-4 Cristy  <quetzlzacatenango@image...>
   * Quote passwords when passed to a delegate program.
+  * Iterate channels over source image rather than destination (bug report
+    from Hanno Böck).
 
 2016-05-09  7.0.1-3 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.1-3, GIT revision 10755:d540dda:20160509.

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 0c8b18d91391c747f68b88c22af675f4ca7613a8..4d6979c4edc7974f43975d4aa8719aa7d026b546 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -1923,7 +1923,7 @@ MagickExport Image *SimilarityImage(const Image *image,const Image *reference,
           q+=GetPixelChannels(similarity_image);
           continue;
         }
-      for (i=0; i < (ssize_t) GetPixelChannels(similarity_image); i++)
+      for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
       {
         PixelChannel channel=GetPixelChannelChannel(image,i);
         PixelTrait traits=GetPixelChannelTraits(image,channel);

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 2d2c94c0b0d013f796a44af6186649b5261950ba..1473335387b99825ff8ed4571795a089b75f0a4c 100644 (file)
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1750,7 +1750,7 @@ MagickExport Image *InterpolativeResizeImage(const Image *image,
           q+=GetPixelChannels(resize_image);
           continue;
         }
-      for (i=0; i < (ssize_t) GetPixelChannels(resize_image); i++)
+      for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
       {
         PixelChannel
           channel;
@@ -2515,7 +2515,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) GetPixelChannels(resize_image); i++)
+      for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
       {
         double
           alpha,
@@ -2731,7 +2731,7 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) GetPixelChannels(resize_image); i++)
+      for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
       {
         double
           alpha,