]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authoranthony <anthony@git.imagemagick.org>
Wed, 17 Oct 2012 02:37:29 +0000 (02:37 +0000)
committeranthony <anthony@git.imagemagick.org>
Wed, 17 Oct 2012 02:37:29 +0000 (02:37 +0000)
MagickCore/resize.c

index b27f1051fb2846399ab9e2498de5175d1e2c3f71..468ecd7e144e0cd141c4696926cb42afb87dbc67 100644 (file)
@@ -940,6 +940,7 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
       case LanczosSharpFilter:
       case Lanczos2Filter:
       case Lanczos2SharpFilter:
+      case LanczosRadiusFilter:
         resize_filter->filter=filters[JincFilter].function;
         resize_filter->window=filters[JincFilter].function;
         resize_filter->scale=filters[JincFilter].scale;
@@ -978,7 +979,7 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
     resize_filter->coefficient[2]=MagickEpsilonReciprocal(Magick2PI*value*value);
        /* normalization - not actually needed or used! */
     if ( value > 0.5 )
-      resize_filter->support *= value/0.5;  /* increase support */
+      resize_filter->support *= 2*value;  /* increase support linearly */
   }
 
   /* User Kaiser Alpha Override - no support change */
@@ -999,13 +1000,6 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
     resize_filter->coefficient[1]=MagickEpsilonReciprocal(I0(value)); /* normalization */
   }
 
-  /* Blur Override */
-  artifact=GetImageArtifact(image,"filter:blur");
-  if (artifact != (const char *) NULL)
-    resize_filter->blur*=StringToDouble(artifact,(char **) NULL);
-  if (resize_filter->blur < MagickEpsilon)
-    resize_filter->blur=(double) MagickEpsilon;
-
   /* Support Overrides */
   artifact=GetImageArtifact(image,"filter:lobes");
   if (artifact != (const char *) NULL)
@@ -1033,7 +1027,14 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
                                        resize_filter->support;
       }
     }
-  /* expert override of the support setting */
+  /* Expert Blur Override */
+  artifact=GetImageArtifact(image,"filter:blur");
+  if (artifact != (const char *) NULL)
+    resize_filter->blur*=StringToDouble(artifact,(char **) NULL);
+  if (resize_filter->blur < MagickEpsilon)
+    resize_filter->blur=(double) MagickEpsilon;
+
+  /* Expert override of the support setting */
   artifact=GetImageArtifact(image,"filter:support");
   if (artifact != (const char *) NULL)
     resize_filter->support=fabs(StringToDouble(artifact,(char **) NULL));