Resample in Magick++ now uses a Point instead of a Geometry.

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index a9958eeb704971be2a96f4c522ce155326dbc94b..10228d3367c0cb70f92ae444671a7b0ee6a2e0fd 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -3948,27 +3948,14 @@ void Magick::Image::reduceNoise(const double order_)
   ThrowPPException;
 }
 
-void Magick::Image::resample(const Geometry &geometry_)
+void Magick::Image::resample(const Point &density_)
 {
   MagickCore::Image
     *newImage;
 
-  size_t
-    height=rows(),
-    width=columns();
-
-  ssize_t
-    x=0,
-    y=0;
-
-  // Calculate new size.  This code should be supported using binary arguments
-  // in the ImageMagick library.
-  ParseMetaGeometry(static_cast<std::string>(geometry_).c_str(),&x,&y,&width,
-    &height);
-
   GetPPException;
-  newImage=ResampleImage(constImage(),width,height,image()->filter,
-    exceptionInfo);
+  newImage=ResampleImage(constImage(),density_.x(),density_.y(),
+    image()->filter,exceptionInfo);
   replaceImage(newImage);
   ThrowPPException;
 }

diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index fef85867dec026c72cf85b0a24135bb12f8c6560..f0a23686d9f6e414b18d1a1f6acf0ddfa7249dee 100644 (file)
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -1193,7 +1193,7 @@ namespace Magick
     void reduceNoise(const double order_);
 
     // Resize image in terms of its pixel size.
-    void resample(const Geometry &geometry_);
+    void resample(const Point &density_);
 
     // Resize image to specified size.
     void resize(const Geometry &geometry_);