(no commit message)

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 8e7b91528eaf8ce8c2b19dfd5c747eb508ad921b..305f9e4a1e04526c0eb5ed0a27f2d22869c67bbe 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -2829,7 +2829,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius,
                 pixels+=GetPixelChannels(image);
                 luminance_pixels+=GetPixelChannels(luminance_image);
               }
-              pixels+=image->columns*GetPixelChannels(image);
+              pixels+=(image->columns-1)*GetPixelChannels(image);
               luminance_pixels+=luminance_image->columns*
                 GetPixelChannels(luminance_image);
             }
@@ -2857,7 +2857,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius,
             pixels+=GetPixelChannels(image);
             luminance_pixels+=GetPixelChannels(luminance_image);
           }
-          pixels+=image->columns*GetPixelChannels(image);
+          pixels+=(image->columns-1)*GetPixelChannels(image);
           luminance_pixels+=luminance_image->columns*
             GetPixelChannels(luminance_image);
         }

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 680ced31ff629f1deb6f87d2dbe7088716d9b15a..909dcc92bb3de5442cec0a78dccf8c548384952d 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -2918,7 +2918,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                     k--;
                     pixels+=GetPixelChannels(image);
                   }
-                  pixels+=image->columns*GetPixelChannels(image);
+                  pixels+=(image->columns-1)*GetPixelChannels(image);
                 }
                 gamma=PerceptibleReciprocal(gamma);
                 pixel*=gamma;
@@ -2940,7 +2940,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k--;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=image->columns*GetPixelChannels(image);
+              pixels+=(image->columns-1)*GetPixelChannels(image);
             }
             gamma=PerceptibleReciprocal(gamma);
             pixel*=gamma;
@@ -2969,7 +2969,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k++;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=image->columns*GetPixelChannels(image);
+              pixels+=(image->columns-1)*GetPixelChannels(image);
             }
             break;
           }
@@ -2999,7 +2999,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k--;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=image->columns*GetPixelChannels(image);
+              pixels+=(image->columns-1)*GetPixelChannels(image);
             }
             break;
           }
@@ -3041,7 +3041,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k++;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=image->columns*GetPixelChannels(image);
+              pixels+=(image->columns-1)*GetPixelChannels(image);
             }
             pixel-=maximum;
             if (pixel < 0.0)
@@ -3076,7 +3076,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k++;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=image->columns*GetPixelChannels(image);
+              pixels+=(image->columns-1)*GetPixelChannels(image);
             }
             break;
           }
@@ -3103,7 +3103,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k--;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=image->columns*GetPixelChannels(image);
+              pixels+=(image->columns-1)*GetPixelChannels(image);
             }
             break;
           }
@@ -3145,7 +3145,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k--;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=image->columns*GetPixelChannels(image);
+              pixels+=(image->columns-1)*GetPixelChannels(image);
             }
             break;
           }

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 010c2c5c1b7235e6a49da652bef026bf6939e499..83b43d58689e047b20a941aa6583139ec62215a3 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -2500,7 +2500,7 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type,
             InsertPixelList(image,pixels[i],pixel_list[id]);
             pixels+=GetPixelChannels(image);
           }
-          pixels+=image->columns*GetPixelChannels(image);
+          pixels+=(image->columns-1)*GetPixelChannels(image);
         }
         switch (type)
         {

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 761ceeaf33fca3dc0dd7e606773d621bf2efdc46..e265cc453af45e27b21f2d52414e5740df668864 100644 (file)
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -290,7 +290,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
           channel_sum[channel]+=pixels[i];
           pixels+=GetPixelChannels(image);
         }
-        pixels+=image->columns*GetPixelChannels(image);
+        pixels+=(image->columns-1)*GetPixelChannels(image);
       }
     }
     for (x=0; x < (ssize_t) image->columns; x++)