From e1b872a835f7612290e2f255b959ccd29a360d99 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 19 Jan 2012 17:36:44 +0000 Subject: [PATCH] --- Magick++/lib/Magick++/Options.h | 4 ---- Magick++/lib/Options.cpp | 9 --------- PerlMagick/Magick.xs | 12 ++---------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/Magick++/lib/Magick++/Options.h b/Magick++/lib/Magick++/Options.h index 1b3220840..430bd29db 100644 --- 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 1ded7bc7a..8711a52cf 100644 --- a/Magick++/lib/Options.cpp +++ b/Magick++/lib/Options.cpp @@ -792,15 +792,6 @@ bool Magick::Options::verbose ( void ) const return static_cast(_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(_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 7b3dbfc91..f314f358b 100644 --- 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 */ -- 2.40.0