Merge master.

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

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index dbfd8c6d4ed48038eeac2b83e6a8fffe558d3da4..039b1113300937fde92b65a7cad3f69880f3cb6f 100644 (file)
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -18,8 +18,8 @@
 */
 
 #include <Magick++.h>
-#include <libdcp/util.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/util.h>
+#include <dcp/raw_convert.h>
 #include "image_proxy.h"
 #include "image.h"
 #include "exceptions.h"
@@ -51,11 +51,11 @@ RawImageProxy::RawImageProxy (shared_ptr<Image> image, shared_ptr<Log> log)
 RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
        : ImageProxy (log)
 {
-       libdcp::Size size (
+       dcp::Size size (
                xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
                );
 
-       _image.reset (new Image (PIX_FMT_RGB24, size, true));
+       _image.reset (new Image (static_cast<AVPixelFormat> (xml->number_child<int> ("PixelFormat")), size, true));
        _image->read_from_socket (socket);
 }
 
@@ -69,8 +69,9 @@ void
 RawImageProxy::add_metadata (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text (N_("Raw"));
-       node->add_child("Width")->add_child_text (libdcp::raw_convert<string> (_image->size().width));
-       node->add_child("Height")->add_child_text (libdcp::raw_convert<string> (_image->size().height));
+       node->add_child("Width")->add_child_text (dcp::raw_convert<string> (_image->size().width));
+       node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_image->size().height));
+       node->add_child("PixelFormat")->add_child_text (dcp::raw_convert<string> (_image->pixel_format ()));
 }
 
 void
@@ -127,15 +128,18 @@ MagickImageProxy::image () const
                throw DecodeError (_("Could not decode image file"));
        }
 
+       dcp::Size size (magick_image->columns(), magick_image->rows());
        LOG_TIMING ("[%1] MagickImageProxy decode finished", boost::this_thread::get_id ());
 
-       libdcp::Size size (magick_image->columns(), magick_image->rows());
-
        _image.reset (new Image (PIX_FMT_RGB24, size, true));
 
-       using namespace MagickCore;
-
-       magick_image->write (0, 0, size.width, size.height, "RGB", CharPixel, _image->data()[0]);
+       /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
+       uint8_t* p = _image->data()[0];
+       for (int i = 0; i < size.height; ++i) {
+               using namespace MagickCore;
+               magick_image->write (0, i, size.width, 1, "RGB", CharPixel, p);
+               p += _image->stride()[0];
+       }
 
        delete magick_image;