Fix name of header guard.

[dcpomatic.git] / src / lib / image.cc

diff --git a/src/lib/image.cc b/src/lib/image.cc
index bdd4f61d8d7abd33470654f36604f3c7dfbf730b..b75c0f083bd9bcb5cedcd423d388aea5e1df760b 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -791,6 +791,34 @@ Image::Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels)
        allocate ();
 }
 
+/** Construct an Image from some PNG data */
+Image::Image (dcp::Data png)
+{
+       Magick::Blob blob;
+       blob.update (png.data().get(), png.size());
+       Magick::Image* magick_image = new Magick::Image (blob);
+       _size = dcp::Size(magick_image->columns(), magick_image->rows());
+       _pixel_format = AV_PIX_FMT_BGRA;
+       _aligned = true;
+       _extra_pixels = 0;
+       allocate ();
+
+       /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
+       uint8_t* p = data()[0];
+       for (int i = 0; i < _size.height; ++i) {
+#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE
+               using namespace MagickCore;
+#endif
+#ifdef DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE
+               using namespace MagickLib;
+#endif
+               magick_image->write (0, i, _size.width, 1, "BGRA", CharPixel, p);
+               p += stride()[0];
+       }
+
+       delete magick_image;
+}
+
 void
 Image::allocate ()
 {
@@ -826,7 +854,7 @@ Image::allocate ()
 }
 
 Image::Image (Image const & other)
-       : enable_shared_from_this<Image>(other)
+       : boost::enable_shared_from_this<Image>(other)
        , _size (other._size)
        , _pixel_format (other._pixel_format)
        , _aligned (other._aligned)