From: cristy Date: Wed, 6 Mar 2013 22:30:46 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4137 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b772effec6594fbd2b304bb685cfa6226f48780b;p=imagemagick --- diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 8e7b91528..305f9e4a1 100644 --- 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 680ced31f..909dcc92b 100644 --- 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 010c2c5c1..83b43d586 100644 --- 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 761ceeaf3..e265cc453 100644 --- 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++)