Changeset 3881

Timestamp:

03/17/11 08:14:06 (2 years ago)

Author:

anthony

Message:

Backout the Variable Blur Compose Patch!

Location:

ImageMagick/trunk

Files:

• ChangeLog (modified) (1 diff)
• magick/composite.c (modified) (5 diffs)

ImageMagick/trunk/ChangeLog

@@ +1 @@
+2011-03-17 6.6.8-5 Anthony Thyssen <A.Thyssen@griffith...>
+  * Backed out the patch for Variable Blur Composition that was added
+    2011-02-13 v6.6.7-7, until I can re-think the problem.
+    The existing fix was failing to do circular blurs correctly.
+
 2011-03-14  6.6.8-5 Glenn Randers-Pehrson <glennrp@image...>
   * Fixed a rounding/truncation error while writing the pHYs chunk in the

ImageMagick/trunk/magick/composite.c

@@ -1731 +1731 @@
           return(MagickFalse);
         }
-      /* Set up ellipse, Scales for blur map values */
-      width=geometry_info.rho*QuantumScale;
-      height=geometry_info.sigma*QuantumScale;
-      blur.x1=1.0;
+      width=geometry_info.rho;
+      height=geometry_info.sigma;
+      blur.x1=geometry_info.rho;
       blur.x2=0.0;
       blur.y1=0.0;
-      blur.y2=1.0;
+      blur.y2=geometry_info.sigma;
       angle_start=0.0;
       angle_range=0.0;
@@ -1748 +1747 @@
 
           angle=DegreesToRadians(geometry_info.xi);
-          blur.x1=cos(angle);
-          blur.x2=sin(angle);
-          blur.y1=-sin(angle);
-          blur.y2=cos(angle);
+          blur.x1=width*cos(angle);
+          blur.x2=width*sin(angle);
+          blur.y1=(-height*sin(angle));
+          blur.y2=height*cos(angle);
         }
       if ((flags & YValue) != 0 )
@@ -1795 +1794 @@
         for (x=0; x < (ssize_t) composite_image->columns; x++)
         {
-          MagickRealType
-            b,
-            h,
-            w;
-
           if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns))
             {
@@ -1805 +1799 @@
               continue;
             }
-          /* if w or h blurs are getting too small,
-           * adjust the filter sigma, rather than the ellipse
-           */
-          w=width*GetRedPixelComponent(p);
-          h=height*GetGreenPixelComponent(p);
-          b=MagickMax(w,h) + MagickEpsilon;
-          if ( b < 1.0 )
-            w /= b, h /= b; /* make sure ellipse does not get too small */
-          else
-            b = 1.0;
-          /* rotate the ellipse */
           if (fabs(angle_range) > MagickEpsilon)
             {
@@ -1823 +1806 @@
               angle=angle_start+angle_range*QuantumScale*
                 GetBluePixelComponent(p);
-
-              blur.x1=cos(angle);
-              blur.x2=sin(angle);
-              blur.y1=-sin(angle);
-              blur.y2=cos(angle);
+              blur.x1=width*cos(angle);
+              blur.x2=width*sin(angle);
+              blur.y1=(-height*sin(angle));
+              blur.y2=height*cos(angle);
             }
-          SetResampleFilter(resample_filter,GaussianFilter,2.0*b);
-          ScaleResampleFilter(resample_filter,blur.x1*w,blur.y1*h,
-               blur.x2*w,blur.y2*h);
+          ScaleResampleFilter(resample_filter,blur.x1*QuantumScale*p->red,
+            blur.y1*QuantumScale*p->green,blur.x2*QuantumScale*p->red,
+            blur.y2*QuantumScale*GetGreenPixelComponent(p));
           (void) ResamplePixelColor(resample_filter,(double) x_offset+x,
             (double) y_offset+y,&pixel);