From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 2 Apr 2017 19:56:17 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.5-5~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce1c7727dc5cff7e79f7ccda39bedb18e7e6d0b2;p=imagemagick

...
---

diff --git a/Magick++/lib/Magick++/Pixels.h b/Magick++/lib/Magick++/Pixels.h
index d2b02c6cf..1eb11b001 100644
--- a/Magick++/lib/Magick++/Pixels.h
+++ b/Magick++/lib/Magick++/Pixels.h
@@ -36,8 +36,8 @@ namespace Magick
     const Quantum *getConst(const ::ssize_t x_,const ::ssize_t y_,
       const size_t columns_,const size_t rows_);
 
-    // Return pixel colormap index array
-    //Quantum *metacontent(void);
+    // Return pixel metacontent
+    void *metacontent(void);
 
     // Returns the offset for the specified channel.
     ssize_t offset(PixelChannel channel) const;
diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp
index 571dd2e25..a24f5a331 100644
--- a/Magick++/lib/Pixels.cpp
+++ b/Magick++/lib/Pixels.cpp
@@ -97,13 +97,10 @@ void Magick::Pixels::sync(void)
 }
 
 // Return pixel meta content
-Magick::void* Magick::Pixels::metacontent(void)
+void* Magick::Pixels::metacontent(void)
 {
   void* pixel_metacontent=GetCacheViewAuthenticMetacontent(_view);
 
-  if (!pixel_metacontent)
-    _image.throwImageException();
-
   return pixel_metacontent;
 }