X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.h;h=1392f66b9cd9b33620c73c5f78c164a66a245a2d;hb=5c0a67869dbddb924c9f5ccb4126aa06d85b9b8b;hp=c2f04e1768e8bbaee0482b8b248667068f2aecce;hpb=228fbab81a5f093e9265d565c1110582c363def3;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index c2f04e176..1392f66b9 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include "image_proxy.h"
 #include <dcp/util.h>
 
-class EncodedData;
+class Data;
 
 class J2KImageProxy : public ImageProxy
 {
@@ -34,7 +34,7 @@ public:
 	void add_metadata (xmlpp::Node *) const;
 	void send_binary (boost::shared_ptr<Socket>) const;
 
-	boost::shared_ptr<EncodedData> j2k () const;
+	boost::shared_ptr<Data> j2k () const;
 	dcp::Size size () const {
 		return _size;
 	}
@@ -43,5 +43,5 @@ private:
 	boost::shared_ptr<const dcp::MonoPictureFrame> _mono;
 	boost::shared_ptr<const dcp::StereoPictureFrame> _stereo;
 	dcp::Size _size;
-	dcp::Eye _eye;
+	boost::optional<dcp::Eye> _eye;
 };