From ac1d52f98e8db9d428b08eb1de655ddfc83836e3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 10 Jun 2014 10:24:06 +0100 Subject: Fix server/client with non-RGB24 images. --- src/lib/image_proxy.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index 618cdbcf3..4e2f8a135 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -55,7 +55,7 @@ RawImageProxy::RawImageProxy (shared_ptr xml, shared_ptr soc xml->number_child ("Width"), xml->number_child ("Height") ); - _image.reset (new Image (PIX_FMT_RGB24, size, true)); + _image.reset (new Image (static_cast (xml->number_child ("PixelFormat")), size, true)); _image->read_from_socket (socket); } @@ -71,6 +71,7 @@ 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 (_image->size().width)); node->add_child("Height")->add_child_text (libdcp::raw_convert (_image->size().height)); + node->add_child("PixelFormat")->add_child_text (libdcp::raw_convert (_image->pixel_format ())); } void -- cgit v1.2.3