Added grayScale to Magick++.

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index e3301ca38eefde4f6f8756f77f7f59730757c1ee..309a4313d5422453b62c4500b55aff2e2e2d2dc7 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -3219,6 +3219,14 @@ Magick::Quantum *Magick::Image::getPixels(const ssize_t x_,const ssize_t y_,
   return(result);
 }
 
+void Magick::Image::grayScale(const PixelIntensityMethod method_)
+{
+  modifyImage();
+  GetPPException;
+  (void) GrayscaleImage(image(),method_,exceptionInfo);
+  ThrowPPException;
+}
+
 void  Magick::Image::haldClut(const Image &clutImage_)
 {
   modifyImage();

diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index c4316abee986aaea0be728e399474d61399719d6..b5fa3c65992af7099b6de6079640325f0e7f869f 100644 (file)
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -975,6 +975,9 @@ namespace Magick
     Quantum *getPixels(const ::ssize_t x_,const ::ssize_t y_,
       const size_t columns_,const size_t rows_);
 
+    // Converts the colors in the image to gray.
+    void grayScale(const PixelIntensityMethod method_);
+
     // Apply a color lookup table (Hald CLUT) to the image.
     void haldClut(const Image &clutImage_);
 

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index dedc464a9b2529a72a4d0bcbc6b5378011b437b7..d19ff0248c4493cb7ced14f5051b46b3ec338b8e 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -828,6 +828,22 @@ namespace Magick
   using MagickCore::CompositePixelChannel;
   using MagickCore::SyncPixelChannel;
 
+  // PixelInfo structure
+  using MagickCore::PixelInfo;
+
+  // Pixel intensity method
+  using MagickCore::PixelIntensityMethod;
+  using MagickCore::UndefinedPixelIntensityMethod;
+  using MagickCore::AveragePixelIntensityMethod;
+  using MagickCore::BrightnessPixelIntensityMethod;
+  using MagickCore::LightnessPixelIntensityMethod;
+  using MagickCore::MSPixelIntensityMethod;
+  using MagickCore::Rec601LumaPixelIntensityMethod;
+  using MagickCore::Rec601LuminancePixelIntensityMethod;
+  using MagickCore::Rec709LumaPixelIntensityMethod;
+  using MagickCore::Rec709LuminancePixelIntensityMethod;
+  using MagickCore::RMSPixelIntensityMethod;
+
   // PixelInterpolate methods
   using MagickCore::PixelInterpolateMethod;
   using MagickCore::UndefinedInterpolatePixel;
@@ -881,6 +897,9 @@ namespace Magick
   using MagickCore::CharcoalDrawingPreview;
   using MagickCore::JPEGPreview;
 
+  //  Quantum
+  using MagickCore::Quantum;
+
   // Quantum types
   using MagickCore::QuantumType;
   using MagickCore::IndexQuantum;
@@ -921,10 +940,6 @@ namespace Magick
   using MagickCore::PixelsPerInchResolution;
   using MagickCore::PixelsPerCentimeterResolution;
 
-  // PixelInfo structure
-  using MagickCore::PixelInfo;
-  using MagickCore::Quantum;
-
   // Sparse Color methods
   using MagickCore::SparseColorMethod;
   using MagickCore::UndefinedColorInterpolate;
@@ -1253,6 +1268,7 @@ namespace Magick
   using MagickCore::GetImageVirtualPixelMethod;
   using MagickCore::GlobExpression;
   using MagickCore::GravityAdjustGeometry;
+  using MagickCore::GrayscaleImage;
   using MagickCore::GreaterValue;
   using MagickCore::HaldClutImage;
   using MagickCore::HeightValue;