From: dirk <dirk@git.imagemagick.org>
Date: Sat, 3 May 2014 16:19:44 +0000 (+0000)
Subject: Added policy exceptions to Magick++.
X-Git-Tag: 7.0.1-0~2366
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=caa4d7415dc03d49be07b829bdbae58bc8f76a33;p=imagemagick

Added policy exceptions to Magick++.
---

diff --git a/Magick++/lib/Exception.cpp b/Magick++/lib/Exception.cpp
index 647fad200..80dfb9b97 100644
--- a/Magick++/lib/Exception.cpp
+++ b/Magick++/lib/Exception.cpp
@@ -172,6 +172,15 @@ Magick::ErrorOption::~ErrorOption() throw()
 {
 }
 
+Magick::ErrorPolicy::~ErrorPolicy() throw()
+{
+}
+
+Magick::ErrorPolicy::ErrorPolicy(const std::string& what_)
+  : Error(what_)
+{
+}
+
 Magick::ErrorRegistry::ErrorRegistry(const std::string& what_)
   : Error(what_)
 {
@@ -349,6 +358,15 @@ Magick::WarningOption::WarningOption(const std::string& what_)
 {
 }
 
+Magick::WarningPolicy::~WarningPolicy() throw()
+{
+}
+
+Magick::WarningPolicy::WarningPolicy(const std::string& what_)
+  : Warning(what_)
+{
+}
+
 Magick::WarningOption::~WarningOption() throw()
 {
 }
diff --git a/Magick++/lib/Magick++/Exception.h b/Magick++/lib/Magick++/Exception.h
index 4659673d9..a99e41de2 100644
--- a/Magick++/lib/Magick++/Exception.h
+++ b/Magick++/lib/Magick++/Exception.h
@@ -143,6 +143,13 @@ namespace Magick
     ~ErrorOption() throw();
   };
 
+  class MagickPPExport ErrorPolicy: public Error
+  {
+  public:
+    explicit ErrorPolicy(const std::string& what_);
+    ~ErrorPolicy() throw();
+  };
+
   class MagickPPExport ErrorRegistry: public Error
   {
   public:
@@ -287,6 +294,13 @@ namespace Magick
     ~WarningOption() throw();
   };
 
+  class MagickPPExport WarningPolicy: public Warning
+  {
+  public:
+    explicit WarningPolicy(const std::string& what_);
+    ~WarningPolicy() throw();
+  };
+
   class MagickPPExport WarningRegistry: public Warning
   {
   public:
diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 6e0e39a66..750f9953f 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -1319,6 +1319,9 @@ namespace Magick
   using MagickCore::PixelWand;
   using MagickCore::PointInfo;
   using MagickCore::PolaroidImage;
+  using MagickCore::PolicyWarning;
+  using MagickCore::PolicyError;
+  using MagickCore::PolicyFatalError;
   using MagickCore::PopDrawingWand;
   using MagickCore::PosterizeImage;
   using MagickCore::ProfileImage;