Remove unnecessary subtitle digest components.

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

diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index 41aede6130d420b63dcc29ae843b9850dc55ce94..cb168ce63a7797e6cf17aa8f8c42ca3cd81c2eca 100644 (file)
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -17,13 +17,15 @@
 
 */
 
-#include <Magick++.h>
 #include "magick_image_proxy.h"
 #include "cross.h"
 #include "exceptions.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "compose.hpp"
+#include <Magick++.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -101,7 +103,7 @@ MagickImageProxy::image (optional<dcp::NoteHandler>) const
 
        dcp::Size size (magick_image->columns(), magick_image->rows());
 
-       _image.reset (new Image (PIX_FMT_RGB24, size, true));
+       _image.reset (new Image (AV_PIX_FMT_RGB24, size, true));
 
        /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
        uint8_t* p = _image->data()[0];
@@ -147,3 +149,9 @@ MagickImageProxy::same (shared_ptr<const ImageProxy> other) const
 
        return memcmp (_blob.data(), mp->_blob.data(), _blob.length()) == 0;
 }
+
+AVPixelFormat
+MagickImageProxy::pixel_format () const
+{
+       return AV_PIX_FMT_RGB24;
+}