(no commit message)

diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index a6672334c3326090873666ebd18bfaacccd033b3..0c0f394b90508637da0d26ab4ac010ea1588ece3 100644 (file)
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -321,8 +321,8 @@ static void ConvolveNotify(const char *message,const void *data,size_t length,
 }
 
 static MagickBooleanType BindConvolveParameters(ConvolveInfo *convolve_info,
-  const Image *image,const void *pixels,double *filter,
-  const size_t width,const size_t height,void *convolve_pixels)
+  const Image *image,const void *pixels,double *filter,const size_t width,
+  const size_t height,void *convolve_pixels)
 {
   cl_int
     status;
@@ -425,8 +425,8 @@ static ConvolveInfo *DestroyConvolveInfo(ConvolveInfo *convolve_info)
 }
 
 static MagickBooleanType EnqueueConvolveKernel(ConvolveInfo *convolve_info,
-  const Image *image,const void *pixels,double *filter,
-  const size_t width,const size_t height,void *convolve_pixels)
+  const Image *image,const void *pixels,double *filter,const size_t width,
+  const size_t height,void *convolve_pixels)
 {
   cl_int
     status;

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index dd7e801bf826e641e1f8c58dbff7978fffc9d630..98ea3197aa32d82e5fabd459461d834e6d552491 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -3144,10 +3144,10 @@ MagickExport Image *SelectiveBlurImage(const Image *image,
     i;
 
   size_t
-    center,
     width;
 
   ssize_t
+    center,
     j,
     u,
     v,
@@ -3219,8 +3219,8 @@ MagickExport Image *SelectiveBlurImage(const Image *image,
   */
   status=MagickTrue;
   progress=0;
-  center=(ssize_t) GetPixelChannels(image)*(image->columns+width)*(width/2L)+
-    GetPixelChannels(image)*(width/2L);
+  center=(ssize_t) (GetPixelChannels(image)*(image->columns+width)*(width/2L)+
+    GetPixelChannels(image)*(width/2L));
   image_view=AcquireCacheView(image);
   blur_view=AcquireCacheView(blur_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -3300,7 +3300,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,
         k=kernel;
         pixel=bias;
         pixels=p;
-        intensity=GetPixelIntensity(image,p+center);
+        intensity=(MagickRealType) GetPixelIntensity(image,p+center);
         gamma=0.0;
         if ((blur_traits & BlendPixelTrait) == 0)
           {