(no commit message)

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index a48c64964eb7eea16306dabe53477aedb5f2cc72..977a4f46523803b5ccd7461fb42f203d48dac569 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -2192,7 +2192,8 @@ MagickExport Image *FilterImageChannel(const Image *image,
       pixel=bias;
       k=kernel->values;
       kernel_pixels=p;
-      if (((GetPixelAlphaTraits(image) & ActivePixelTrait) == 0) || (image->matte == MagickFalse))
+      if (((GetPixelAlphaTraits(image) & ActivePixelTrait) == 0) ||
+          (image->matte == MagickFalse))
         {
           for (v=0; v < (ssize_t) kernel->width; v++)
           {
@@ -2264,7 +2265,7 @@ MagickExport Image *FilterImageChannel(const Image *image,
               gamma+=(*k)*alpha;
               k++;
             }
-            kernel_pixels+=(image->columns+kernel->width);
+            kernel_pixels+=(image->columns+kernel->width)*
               GetPixelChannels(image);
           }
           gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 613ad505e527c8e059304aa452057e4d6d97b41f..07d4baf6d298bac3d2cff62d27625bbfd5d7be0c 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -3747,7 +3747,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           status=MagickFalse;
           break;
         }
-      AlphaBlendPixelInfo(image,p+0*GetPixelChannels(image),pixels+0,alpha+0);
+      AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
       AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
       AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
       AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
@@ -3800,7 +3800,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           status=MagickFalse;
           break;
         }
-      AlphaBlendPixelInfo(image,p+0*GetPixelChannels(image),pixels+0,alpha+0);
+      AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
       AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
       AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
       AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
@@ -3842,7 +3842,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           status=MagickFalse;
           break;
         }
-      AlphaBlendPixelInfo(image,p+0*GetPixelChannels(image),pixels+0,alpha+0);
+      AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
       AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
       AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
       AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
@@ -3929,7 +3929,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           status=MagickFalse;
           break;
         }
-      AlphaBlendPixelInfo(image,p+0*GetPixelChannels(image),pixels+0,alpha+0);
+      AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
       AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
       AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
       AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
@@ -4065,7 +4065,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
           status=MagickFalse;
           break;
         }
-      AlphaBlendPixelInfo(image,p+0*GetPixelChannels(image),pixels+0,alpha+0);
+      AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
       AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
       AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
       AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);

diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index 1dce2d71125559638619333ac2044ce9d6d894d9..c5f2726db04ed7b2f9da15779f3772ecd0f64a69 100644 (file)
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -638,7 +638,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry,
     register Quantum
       *restrict q;
 
-    register size_t
+    register ssize_t
       x;
 
     if (status == MagickFalse)