]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Sat, 6 Dec 2014 21:40:39 +0000 (21:40 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Sat, 6 Dec 2014 21:40:39 +0000 (21:40 +0000)
MagickCore/effect.c

index 73b1ffc787b6c1016137e5dd84654c1d8766f8f2..b394ffa373ab121f18dfaa5c5edef15e702fb271 100644 (file)
@@ -2483,6 +2483,13 @@ MagickExport Image *RotationalBlurImage(const Image *image,const double angle,
     *image_view,
     *radial_view;
 
+  double
+    blur_radius,
+    *cos_theta,
+    offset,
+    *sin_theta,
+    theta;
+
   Image
     *blur_image;
 
@@ -2492,13 +2499,6 @@ MagickExport Image *RotationalBlurImage(const Image *image,const double angle,
   MagickOffsetType
     progress;
 
-  double
-    blur_radius,
-    *cos_theta,
-    offset,
-    *sin_theta,
-    theta;
-
   PointInfo
     blur_center;
 
@@ -2972,9 +2972,9 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius,
                 pixels+=GetPixelChannels(image);
                 luminance_pixels+=GetPixelChannels(luminance_image);
               }
-              pixels+=(image->columns-1)*GetPixelChannels(image);
-              luminance_pixels+=(luminance_image->columns-1)*
-                GetPixelChannels(luminance_image);
+              pixels+=GetPixelChannels(image)*image->columns;
+              luminance_pixels+=GetPixelChannels(luminance_image)*
+                luminance_image->columns;
             }
             if (fabs((double) gamma) < MagickEpsilon)
               {
@@ -3000,9 +3000,9 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius,
             pixels+=GetPixelChannels(image);
             luminance_pixels+=GetPixelChannels(luminance_image);
           }
-          pixels+=(image->columns-1)*GetPixelChannels(image);
-          luminance_pixels+=(luminance_image->columns-1)*
-            GetPixelChannels(luminance_image);
+          pixels+=GetPixelChannels(image)*image->columns;
+          luminance_pixels+=GetPixelChannels(luminance_image)*
+            luminance_image->columns;
         }
         if (fabs((double) gamma) < MagickEpsilon)
           {