(no commit message)

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index acf863ad61ea6a38c700a96232f6b7340f6b6d6e..dd14668a0a54dac113af0c9b6aad6b85409ffaac 100644 (file)
--- 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+=(image->columns-1)*GetPixelChannels(image);
+                  pixels+=GetPixelChannels(image)*image->columns;
                 }
                 break;
               }
@@ -2971,7 +2971,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k--;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             break;
           }
@@ -2998,7 +2998,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k++;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             break;
           }
@@ -3029,7 +3029,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k--;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             break;
           }
@@ -3073,7 +3073,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k++;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             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+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             break;
           }
@@ -3139,7 +3139,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k--;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             break;
           }
@@ -3183,7 +3183,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
                 k--;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             break;
           }
@@ -3380,7 +3380,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image,
                 k--;
                 pixels+=GetPixelChannels(image);
               }
-              pixels+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             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+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             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+=(image->columns-1)*GetPixelChannels(image);
-    q+=(image->columns-1)*GetPixelChannels(image);
+    p+=GetPixelChannels(image)*image->columns;
+    q+=GetPixelChannels(image)*image->columns;
     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+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             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+=(image->columns-1)*GetPixelChannels(image);
+              pixels+=GetPixelChannels(image)*image->columns;
             }
             k=(&kernel->values[kernel->width*(kernel->y+1)-1]);
             pixels=q;

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

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index e4113536248a61ede623e768f5db39b69fded000..7a8b6f3954306e2fa03339f747e8f1c78a057806 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-1)*GetPixelChannels(image);
+        pixels+=GetPixelChannels(image)*image->columns;
       }
     }
     for (x=0; x < (ssize_t) image->columns; x++)
@@ -321,7 +321,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
           channel_bias[channel]+=pixels[i];
           pixels+=(width-1)*GetPixelChannels(image);
           channel_sum[channel]+=pixels[i];
-          pixels+=(image->columns-1)*GetPixelChannels(image);
+          pixels+=GetPixelChannels(image)*image->columns;
         }
         mean=(double) (channel_sum[channel]/number_pixels+bias);
         SetPixelChannel(threshold_image,channel,(Quantum) ((double)