Added formatExpression to Image class of Magick++.

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index e1cfea94a9fd478760c560b85460d4da33896d63..7328df3ad258180ec4326b74288d459368112e70 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -963,6 +963,26 @@ std::string Magick::Image::format(void) const
   return(std::string());
 }
 
+std::string Magick::Image::formatExpression(const std::string expression)
+{
+  char
+    *text;
+
+  std::string
+    result;
+
+  GetPPException;
+  text=InterpretImageProperties(imageInfo(),image(),expression.c_str(),
+    &exceptionInfo);
+  if (text != (char *) NULL)
+    {
+      result=std::string(text);
+      text=DestroyString(text);
+    }
+  ThrowPPException;
+  return result;
+}
+
 double Magick::Image::gamma(void) const
 {
   return(constImage()->gamma);

diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index 86b8ca098e2b328ff3733408f2ba3f63f9554df7..2b6482915f9b3dab5a5ff1a19c6f7dab196c946f 100644 (file)
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -297,6 +297,10 @@ namespace Magick
     // Long image format description
     std::string format(void) const;
 
+    // Formats the specified expression
+    // More info here: http://www.imagemagick.org/script/escape.php
+    std::string formatExpression(const std::string expression);
+
     // Gamma level of the image
     double gamma(void) const;
 

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 9697b4712dc12b8b0e731c55b881b17c6ca824cb..4f9defb6ac7748ac094b6193c4d196a4563065a6 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -1016,6 +1016,7 @@ namespace Magick
   using MagickCore::DestroyPixelWand;
   using MagickCore::DestroyQuantizeInfo;
   using MagickCore::DestroyQuantumInfo;
+  using MagickCore::DestroyString;
   using MagickCore::DestroyStringInfo;
   using MagickCore::DisplayImages;
   using MagickCore::DistortImage;
@@ -1184,6 +1185,7 @@ namespace Magick
   using MagickCore::ImageWarning;
   using MagickCore::ImplodeImage;
   using MagickCore::ImportQuantumPixels;
+  using MagickCore::InterpretImageProperties;
   using MagickCore::InverseFourierTransformImage;
   using MagickCore::InvokeDynamicImageFilter;
   using MagickCore::IsEventLogging;