X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=59106098a8351a1634f3e2023816856b9137a681;hb=61bafeda23d9e849f636ac416a745b0ab28bc103;hp=c4d38e6235225bea1b5d43c6420471888ef94e4b;hpb=7a1bd472537fee593a3f088655324861d24e804b;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index c4d38e623..59106098a 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -21,7 +21,7 @@
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "encoded_data.h"
-#include <dcp/raw_convert.h>
+#include "raw_convert.h"
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/colour_conversion.h>
@@ -82,9 +82,9 @@ J2KImageProxy::image (optional<dcp::NoteHandler> note) const
 	shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true));
 
 	if (_mono) {
-		dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note);
+		dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
 	} else {
-		dcp::xyz_to_rgb (_stereo->xyz_image (_eye), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note);
+		dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
 	}
 
 	return image;
@@ -94,14 +94,14 @@ void
 J2KImageProxy::add_metadata (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text (N_("J2K"));
-	node->add_child("Width")->add_child_text (dcp::raw_convert<string> (_size.width));
-	node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_size.height));
+	node->add_child("Width")->add_child_text (raw_convert<string> (_size.width));
+	node->add_child("Height")->add_child_text (raw_convert<string> (_size.height));
 	if (_stereo) {
-		node->add_child("Eye")->add_child_text (dcp::raw_convert<string> (_eye));
-		node->add_child("LeftSize")->add_child_text (dcp::raw_convert<string> (_stereo->left_j2k_size ()));
-		node->add_child("RightSize")->add_child_text (dcp::raw_convert<string> (_stereo->right_j2k_size ()));
+		node->add_child("Eye")->add_child_text (raw_convert<string> (_eye.get ()));
+		node->add_child("LeftSize")->add_child_text (raw_convert<string> (_stereo->left_j2k_size ()));
+		node->add_child("RightSize")->add_child_text (raw_convert<string> (_stereo->right_j2k_size ()));
 	} else {
-		node->add_child("Size")->add_child_text (dcp::raw_convert<string> (_mono->j2k_size ()));
+		node->add_child("Size")->add_child_text (raw_convert<string> (_mono->j2k_size ()));
 	}
 }
 
@@ -122,7 +122,7 @@ J2KImageProxy::j2k () const
 	if (_mono) {
 		return shared_ptr<EncodedData> (new EncodedData (_mono->j2k_data(), _mono->j2k_size()));
 	} else {
-		if (_eye == dcp::EYE_LEFT) {
+		if (_eye.get() == dcp::EYE_LEFT) {
 			return shared_ptr<EncodedData> (new EncodedData (_stereo->left_j2k_data(), _stereo->left_j2k_size()));
 		} else {
 			return shared_ptr<EncodedData> (new EncodedData (_stereo->right_j2k_data(), _stereo->right_j2k_size()));