Removed ClipMask methods.

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index af99a3691f0200f441b0ffb02cb4ae232bd198d7..67a633327bb8c9c8ca237166ab9fd6868fc8c641 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -559,32 +559,6 @@ Magick::ClassType Magick::Image::classType(void) const
   return static_cast<Magick::ClassType>(constImage()->storage_class);
 }
 
-void Magick::Image::clipMask(const Magick::Image &clipMask_)
-{
-  modifyImage();
-
-  GetPPException;
-  if (clipMask_.isValid())
-    SetImageMask(image(),clipMask_.constImage(),exceptionInfo);
-  else
-    SetImageMask(image(),0,exceptionInfo);
-  ThrowPPException;
-}
-
-Magick::Image Magick::Image::clipMask(void) const
-{
-  MagickCore::Image
-    *image;
-
-  GetPPException;
-  image=GetImageMask(constImage(),exceptionInfo);
-  ThrowPPException;
-  if (image == (MagickCore::Image *) NULL)
-    return(Magick::Image());
-  else
-    return(Magick::Image(image));
-}
-
 void Magick::Image::colorFuzz(const double fuzz_)
 {
   modifyImage();

diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index bcf685d8b336ffcb085b6994ad5f7cd71aeef2fd..0d3c5a7c669686867b5e2da137a12c40a20e08f4 100644 (file)
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -172,12 +172,6 @@ namespace Magick
     void classType(const ClassType class_);
     ClassType classType(void) const;
 
-    // Associate a clip mask with the image. The clip mask must be the
-    // same dimensions as the image. Pass an invalid image to unset an
-    // existing clip mask.
-    void clipMask(const Image &clipMask_);
-    Image clipMask(void) const;
-
     // Colors within this distance are considered equal
     void colorFuzz(const double fuzz_);
     double colorFuzz(void) const;
@@ -316,7 +310,7 @@ namespace Magick
     std::string magick(void) const;
 
     // Associate a mask with the image. The mask must be the same dimensions
-    // as the image. Pass an invalid image to unset an existing clip mask.
+    // as the image. Pass an invalid image to unset an existing mask.
     void mask(const Image &mask_);
     Image mask(void) const;
 

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 87df70bc8d3fea23f8cf8bf4012190ad86fe041d..a1d1a584fe1d03c40fa600133f02612edc0c5fd1 100644 (file)
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -513,7 +513,6 @@ extern MagickExport Image
   *CloneImage(const Image *,const size_t,const size_t,const MagickBooleanType,
     ExceptionInfo *),
   *DestroyImage(Image *),
-  *GetImageClipMask(const Image *,ExceptionInfo *),
   *GetImageMask(const Image *,ExceptionInfo *),
   *NewMagickImage(const ImageInfo *,const size_t,const size_t,const PixelInfo *,
     ExceptionInfo *),

diff --git a/MagickCore/methods.h b/MagickCore/methods.h
index 9dcb582929e9a1a4f47985390a30560f679df196..ddb67bd95c1b3181ee72dc5c19fff4e85fea6fd1 100644 (file)
--- a/MagickCore/methods.h
+++ b/MagickCore/methods.h
@@ -427,7 +427,6 @@ extern "C" {
 #define GetImageMean  PrependMagickMethod(GetImageMean)
 #define GetImageRange  PrependMagickMethod(GetImageRange)
 #define GetImageStatistics  PrependMagickMethod(GetImageStatistics)
-#define GetImageClipMask  PrependMagickMethod(GetImageClipMask)
 #define GetImageClippingPathAttribute  PrependMagickMethod(GetImageClippingPathAttribute)
 #define GetImageDecoder  PrependMagickMethod(GetImageDecoder)
 #define GetImageDepth  PrependMagickMethod(GetImageDepth)
@@ -1068,7 +1067,6 @@ extern "C" {
 #define SetImageAttribute  PrependMagickMethod(SetImageAttribute)
 #define SetImageBackgroundColor  PrependMagickMethod(SetImageBackgroundColor)
 #define SetImageDepth  PrependMagickMethod(SetImageDepth)
-#define SetImageClipMask  PrependMagickMethod(SetImageClipMask)
 #define SetImageColorspace  PrependMagickMethod(SetImageColorspace)
 #define SetImageDepth  PrependMagickMethod(SetImageDepth)
 #define SetImageExtent  PrependMagickMethod(SetImageExtent)

diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index b7000b71c0d8fd65ac844b674d55fd9c79632718..3e9784a700d98959b904d97e0f381ac1a9fed78a 100644 (file)
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -238,7 +238,6 @@ extern WandExport MagickBooleanType
   MagickSetImageBackgroundColor(MagickWand *,const PixelWand *),
   MagickSetImageBluePrimary(MagickWand *,const double,const double),
   MagickSetImageBorderColor(MagickWand *,const PixelWand *),
-  MagickSetImageClipMask(MagickWand *,const MagickWand *),
   MagickSetImageColor(MagickWand *,const PixelWand *),
   MagickSetImageColormapColor(MagickWand *,const size_t,
     const PixelWand *),
@@ -332,7 +331,6 @@ extern WandExport MagickWand
   *MagickEvaluateImages(MagickWand *,const MagickEvaluateOperator),
   *MagickFxImage(MagickWand *,const char *),
   *MagickGetImage(MagickWand *),
-  *MagickGetImageClipMask(MagickWand *),
   *MagickGetImageRegion(MagickWand *,const size_t,const size_t,const ssize_t,
     const ssize_t),
   *MagickMergeImageLayers(MagickWand *,const LayerMethod),