(no commit message)

diff --git a/Magick++/lib/Magick++/Options.h b/Magick++/lib/Magick++/Options.h
index 1b3220840ba5f41bbeb074f9229a935552d007d7..430bd29db4ad16631be70142950c70d3c3cb5848 100644 (file)
--- a/Magick++/lib/Magick++/Options.h
+++ b/Magick++/lib/Magick++/Options.h
@@ -259,10 +259,6 @@ namespace Magick
     void            view ( const std::string &view_ );
     std::string     view ( void ) const;
 
-    // Virtual pixel method.
-    void            virtualPixelMethod ( VirtualPixelMethod virtual_pixel_method_ );
-    VirtualPixelMethod virtualPixelMethod ( void ) const;
-
     // X11 display name
     void            x11Display ( const std::string &display_ );
     std::string     x11Display ( void ) const;

diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
index 1ded7bc7ac90b64615702986b4608ea42fd314d7..8711a52cfb5f41c6b59100d104a5b884b9f24911 100644 (file)
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -792,15 +792,6 @@ bool Magick::Options::verbose ( void ) const
   return static_cast<bool>(_imageInfo->verbose);
 }
 
-void Magick::Options::virtualPixelMethod ( VirtualPixelMethod virtual_pixel_method_ )
-{
-  _imageInfo->virtual_pixel_method = virtual_pixel_method_;
-}
-Magick::VirtualPixelMethod Magick::Options::virtualPixelMethod ( void ) const
-{
-  return static_cast<Magick::VirtualPixelMethod>(_imageInfo->virtual_pixel_method);
-}
-
 void Magick::Options::view ( const std::string &view_ )
 {
   if ( view_.length() == 0 )

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 7b3dbfc916a69505fb8167cab46ccc03ffe2a984..f314f358b944a1cdbcab548caf6a9a8fe5e72353 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -473,7 +473,7 @@ static struct
     { "AdaptiveResize", { {"geometry", StringReference},
       {"width", IntegerReference}, {"height", IntegerReference},
       {"filter", MagickFilterOptions}, {"support", StringReference },
-      {"blur", RealReference }, {"interpolate", MagickInterpolateOptions} } },
+      {"blur", RealReference } } },
     { "ClipMask", { {"mask", ImageReference} } },
     { "LinearStretch", { {"levels", StringReference},
       {"black-point", RealReference},{"white-point", RealReference} } },
@@ -2191,8 +2191,6 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
                 "UnrecognizedVirtualPixelMethod",SvPV(sval,na));
               break;
             }
-          if (info)
-            info->image_info->virtual_pixel_method=(VirtualPixelMethod) sp;
           for ( ; image; image=image->next)
             SetImageVirtualPixelMethod(image,(VirtualPixelMethod) sp);
           break;
@@ -10118,9 +10116,6 @@ Mogrify(ref,...)
         }
         case 105:  /* AdaptiveResize */
         {
-          PixelInterpolateMethod
-            method;
-
           if (attribute_flag[0] != 0)
             flags=ParseRegionGeometry(image,argument_list[0].string_reference,
               &geometry,exception);
@@ -10135,11 +10130,8 @@ Mogrify(ref,...)
               argument_list[4].string_reference);
           if (attribute_flag[5] != 0)
             image->blur=argument_list[5].real_reference;
-          method=UndefinedInterpolatePixel;
-          if (attribute_flag[6] != 0)
-            method=(PixelInterpolateMethod) argument_list[6].integer_reference;
           image=AdaptiveResizeImage(image,geometry.width,geometry.height,
-            method,exception);
+            exception);
           break;
         }
         case 106:  /* ClipMask */