From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 1 Sep 2017 12:38:36 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/717
X-Git-Tag: 7.0.7-0~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5402b6e0fcf8b694ae2af6a6652ebb8ce0ccf46;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/717
---

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index fd1caf89b..5f5b1c2be 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -3142,14 +3142,14 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns,
           channel;
 
         PixelTrait
-          sample_traits,
+          image_traits,
           traits;
 
-        channel=GetPixelChannelChannel(image,i);
-        traits=GetPixelChannelTraits(image,channel);
-        sample_traits=GetPixelChannelTraits(sample_image,channel);
+        channel=GetPixelChannelChannel(sample_image,i);
+        traits=GetPixelChannelTraits(sample_image,channel);
+        image_traits=GetPixelChannelTraits(image,channel);
         if ((traits == UndefinedPixelTrait) ||
-            (sample_traits == UndefinedPixelTrait))
+            (image_traits == UndefinedPixelTrait))
           continue;
         SetPixelChannel(sample_image,channel,p[x_offset[x]*GetPixelChannels(
           image)+i],q);