From 6c19b21e12f73ce63edd406ea617ff25bcc9bfea Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 30 Nov 2015 00:05:34 +0000
Subject: Use libdcp's compress_j2k; move Data into libdcp.

---
 src/lib/j2k_image_proxy.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/lib/j2k_image_proxy.h')

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 1d34e7f84..9fc96a543 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -18,16 +18,14 @@
 */
 
 #include "image_proxy.h"
-#include "data.h"
 #include <dcp/util.h>
 
 namespace dcp {
 	class MonoPictureFrame;
 	class StereoPictureFrame;
+	class Data;
 }
 
-class Data;
-
 class J2KImageProxy : public ImageProxy
 {
 public:
@@ -43,7 +41,7 @@ public:
 	bool same (boost::shared_ptr<const ImageProxy>) const;
 	AVPixelFormat pixel_format () const;
 
-	Data j2k () const {
+	dcp::Data j2k () const {
 		return _data;
 	}
 
@@ -55,10 +53,10 @@ private:
 	friend struct client_server_test_j2k;
 
 	/* For tests */
-	J2KImageProxy (Data data, dcp::Size size);
+	J2KImageProxy (dcp::Data data, dcp::Size size);
 	void ensure_j2k () const;
 
-	Data _data;
+	dcp::Data _data;
 	dcp::Size _size;
 	boost::optional<dcp::Eye> _eye;
 	mutable boost::shared_ptr<dcp::OpenJPEGImage> _j2k;
-- 
cgit v1.2.3