(no commit message)

[imagemagick] / MagickCore / resample.c

diff --git a/MagickCore/resample.c b/MagickCore/resample.c
index 7f7674a70718bf86d9ea8f23db508d0b56361ce1..055c9bfb63172fc0fcd74c8ac38a7c3041e46298 100644 (file)
--- a/MagickCore/resample.c
+++ b/MagickCore/resample.c
@@ -18,7 +18,7 @@
 %                                August 2007                                  %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -59,6 +59,7 @@
 #include "MagickCore/resample.h"
 #include "MagickCore/resize.h"
 #include "MagickCore/resize-private.h"
+#include "MagickCore/token.h"
 #include "MagickCore/transform.h"
 #include "MagickCore/signature-private.h"
 #include "MagickCore/utility.h"
@@ -231,12 +232,10 @@ MagickExport ResampleFilter *AcquireResampleFilter(const Image *image,
   resample_filter->average_defined = MagickFalse;
 
   /* initialise the resampling filter settings */
-  SetResampleFilter(resample_filter, image->filter, image->blur);
-  (void) SetResampleFilterInterpolateMethod(resample_filter,
-    image->interpolate);
+  SetResampleFilter(resample_filter, image->filter);
+  (void) SetResampleFilterInterpolateMethod(resample_filter,image->interpolate);
   (void) SetResampleFilterVirtualPixelMethod(resample_filter,
     GetImageVirtualPixelMethod(image));
-
   return(resample_filter);
 }
 \f
@@ -333,9 +332,8 @@ MagickExport MagickBooleanType ResamplePixelColor(
   status=MagickTrue;
   /* GetPixelInfo(resample_filter->image,pixel); */
   if ( resample_filter->do_interpolate ) {
-    status=InterpolatePixelInfo(resample_filter->image,
-      resample_filter->view,resample_filter->interpolate,u0,v0,pixel,
-      resample_filter->exception);
+    status=InterpolatePixelInfo(resample_filter->image,resample_filter->view,
+      resample_filter->interpolate,u0,v0,pixel,resample_filter->exception);
     return(status);
   }
 
@@ -469,7 +467,7 @@ MagickExport MagickBooleanType ResamplePixelColor(
           resample_filter->average_defined=MagickTrue;
 
           /* Try to get an averaged pixel color of whole image */
-          average_image=ResizeImage(resample_filter->image,1,1,BoxFilter,1.0,
+          average_image=ResizeImage(resample_filter->image,1,1,BoxFilter,
             resample_filter->exception);
           if (average_image == (Image *) NULL)
             {
@@ -1216,7 +1214,7 @@ MagickExport void ScaleResampleFilter(ResampleFilter *resample_filter,
 %  The format of the SetResampleFilter method is:
 %
 %    void SetResampleFilter(ResampleFilter *resample_filter,
-%      const FilterTypes filter,const double blur)
+%      const FilterTypes filter)
 %
 %  A description of each parameter follows:
 %
@@ -1224,11 +1222,9 @@ MagickExport void ScaleResampleFilter(ResampleFilter *resample_filter,
 %
 %    o filter: the resize filter for elliptical weighting LUT
 %
-%    o blur: filter blur factor (radial scaling) for elliptical weighting LUT
-%
 */
 MagickExport void SetResampleFilter(ResampleFilter *resample_filter,
-  const FilterTypes filter,const double blur)
+  const FilterTypes filter)
 {
   ResizeFilter
      *resize_filter;
@@ -1250,7 +1246,7 @@ MagickExport void SetResampleFilter(ResampleFilter *resample_filter,
     resample_filter->filter = RobidouxFilter;
 
   resize_filter = AcquireResizeFilter(resample_filter->image,
-       resample_filter->filter,blur,MagickTrue,resample_filter->exception);
+    resample_filter->filter,MagickTrue,resample_filter->exception);
   if (resize_filter == (ResizeFilter *) NULL)
     {
       (void) ThrowMagickException(resample_filter->exception,GetMagickModule(),
@@ -1330,7 +1326,8 @@ MagickExport void SetResampleFilter(ResampleFilter *resample_filter,
 
     /* Scale radius so the filter LUT covers the full support range */
     r_scale = resample_filter->support*sqrt(1.0/(double)WLUT_WIDTH);
-    if (IsMagickTrue(GetImageArtifact(resample_filter->image,"resample:verbose")) )
+    if (IfMagickTrue(IsStringTrue(GetImageArtifact(resample_filter->image,
+             "resample:verbose"))) )
       {
         /* Debug output of the filter weighting LUT
           Gnuplot the LUT with hoizontal adjusted to 'r' using...