From aca597f51ca91ee434bba81525c47e32419becb4 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 7 Dec 2014 20:52:46 +0000 Subject: [PATCH] --- MagickCore/morphology.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index dd14668a0..acf863ad6 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2949,7 +2949,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, k--; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } break; } @@ -2971,7 +2971,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, k--; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } break; } @@ -2998,7 +2998,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, k++; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } break; } @@ -3029,7 +3029,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, k--; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } break; } @@ -3073,7 +3073,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, k++; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } pixel-=maximum; if (pixel < 0.0) @@ -3110,7 +3110,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, k++; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } break; } @@ -3139,7 +3139,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, k--; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } break; } @@ -3183,7 +3183,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, k--; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } break; } @@ -3380,7 +3380,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, k--; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } k=(&kernel->values[kernel->width*(kernel->y+1)-1]); pixels=q-offset.x*GetPixelChannels(image); @@ -3411,7 +3411,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, k--; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } k=(&kernel->values[kernel->width*(kernel->y+1)-1]); pixels=q-offset.x*GetPixelChannels(image); @@ -3488,8 +3488,8 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, status=MagickFalse; continue; } - p+=GetPixelChannels(image)*image->columns; - q+=GetPixelChannels(image)*image->columns; + p+=(image->columns-1)*GetPixelChannels(image); + q+=(image->columns-1)*GetPixelChannels(image); center=(ssize_t) (offset.x*GetPixelChannels(image)); for (x=(ssize_t) image->columns-1; x >= 0; x--) { @@ -3541,7 +3541,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, k--; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } k=(&kernel->values[kernel->width*kernel->y+kernel->x-1]); pixels=q; @@ -3573,7 +3573,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, k--; pixels+=GetPixelChannels(image); } - pixels+=GetPixelChannels(image)*image->columns; + pixels+=(image->columns-1)*GetPixelChannels(image); } k=(&kernel->values[kernel->width*(kernel->y+1)-1]); pixels=q; -- 2.40.0