Changeset 7848

Timestamp:

05/09/12 03:27:02 (12 months ago)

Author:

anthony

Message:

Fix Kaiser Resize filter

File:

• ImageMagick/trunk/MagickCore/resize.c (modified) (6 diffs)

ImageMagick/trunk/MagickCore/resize.c

@@ -954 +954 @@
 
   /* User Gaussian Sigma Override - no support change */
-  if (resize_filter->filter == Gaussian) {
+  if ((resize_filter->filter == Gaussian) ||
+      (resize_filter->window == Gaussian) ) {
     value=0.5;    /* guassian sigma default, half pixel */
     artifact=GetImageArtifact(image,"filter:sigma");
@@ -962 +963 @@
     resize_filter->coefficient[0]=value;                 /* note sigma too */
     resize_filter->coefficient[1]=1.0/(2.0*value*value); /* sigma scaling */
-    resize_filter->coefficient[2]=(MagickRealType)
-      (1.0/(Magick2PI*value*value));
+    resize_filter->coefficient[2]=(MagickRealType) (1.0/(Magick2PI*value*value));
        /* normalization - not actually needed or used! */
     if ( value > 0.5 )
@@ -970 +970 @@
 
   /* User Kaiser Alpha Override - no support change */
-  if (resize_filter->filter == Kaiser) {
+  if ((resize_filter->filter == Kaiser) ||
+      (resize_filter->window == Kaiser) ) {
     value=6.5; /* default alpha value for Kaiser bessel windowing function */
     artifact=GetImageArtifact(image,"filter:alpha");
@@ -1031 +1032 @@
   B=0.0;
   C=0.0;
-  if ((filters[filter_type].function == CubicBC) ||
-      (filters[window_type].function == CubicBC))
+  if ((resize_filter->filter == CubicBC) ||
+      (resize_filter->window == CubicBC) )
     {
       B=filters[filter_type].B;
@@ -1109 +1110 @@
              CommandOptionToMnemonic(MagickFilterOptions,filter_type));
         (void) FormatLocaleFile(stdout,"# window = %s\n",
-             CommandOptionToMnemonic(MagickFilterOptions, window_type));
+             CommandOptionToMnemonic(MagickFilterOptions,window_type));
         (void) FormatLocaleFile(stdout,"# support = %.*g\n",
              GetMagickPrecision(),(double) resize_filter->support);
@@ -1116 +1117 @@
         (void) FormatLocaleFile(stdout,"# scale_blur = %.*g\n",
              GetMagickPrecision(), (double)resize_filter->blur);
-        if ( filter_type == GaussianFilter )
+        if ( filter_type == GaussianFilter || window_type == GaussianFilter )
           (void) FormatLocaleFile(stdout,"# gaussian_sigma = %.*g\n",
                GetMagickPrecision(), (double)resize_filter->coefficient[0]);
-        if ( filter_type == KaiserFilter )
+        if ( filter_type == KaiserFilter || window_type == KaiserFilter )
           (void) FormatLocaleFile(stdout,"# kaiser_alpha = %.*g\n",
                GetMagickPrecision(), (double)resize_filter->coefficient[0]);