X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=3fc6ce9b252e50cd7c951069bc04dbe967fca7db;hb=5c0a67869dbddb924c9f5ccb4126aa06d85b9b8b;hp=d9cb79cadb9134c4de780db34329b8cab2e09d6b;hpb=d2f25b8f41d05ca22ab41b1a1a79fe58a9d4adff;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index d9cb79cad..3fc6ce9b2 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -20,8 +20,8 @@
 #include "j2k_image_proxy.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
-#include "encoded_data.h"
-#include <dcp/raw_convert.h>
+#include "data.h"
+#include "raw_convert.h"
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/colour_conversion.h>
@@ -38,7 +38,6 @@ using boost::optional;
 J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
 	: _mono (new dcp::MonoPictureFrame (path))
 	, _size (size)
-	, _eye (EYE_BOTH)
 {
 
 }
@@ -46,7 +45,6 @@ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
 J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size)
 	: _mono (frame)
 	, _size (size)
-	, _eye (EYE_BOTH)
 {
 	
 }
@@ -84,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;
@@ -96,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 ()));
 	}
 }
 
@@ -118,16 +116,16 @@ J2KImageProxy::send_binary (shared_ptr<Socket> socket) const
 	}
 }
 
-shared_ptr<EncodedData>
+shared_ptr<Data>
 J2KImageProxy::j2k () const
 {
 	if (_mono) {
-		return shared_ptr<EncodedData> (new EncodedData (_mono->j2k_data(), _mono->j2k_size()));
+		return shared_ptr<Data> (new Data (_mono->j2k_data(), _mono->j2k_size()));
 	} else {
-		if (_eye == dcp::EYE_LEFT) {
-			return shared_ptr<EncodedData> (new EncodedData (_stereo->left_j2k_data(), _stereo->left_j2k_size()));
+		if (_eye.get() == dcp::EYE_LEFT) {
+			return shared_ptr<Data> (new Data (_stereo->left_j2k_data(), _stereo->left_j2k_size()));
 		} else {
-			return shared_ptr<EncodedData> (new EncodedData (_stereo->right_j2k_data(), _stereo->right_j2k_size()));
+			return shared_ptr<Data> (new Data (_stereo->right_j2k_data(), _stereo->right_j2k_size()));
 		}
 	}
 }