diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-30 00:05:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-04 21:14:06 +0000 |
| commit | 6c19b21e12f73ce63edd406ea617ff25bcc9bfea (patch) | |
| tree | a671b7fd9913abef6eda535ed2551328a078cbcc /src/lib/j2k_image_proxy.cc | |
| parent | b1991796d6a4cbed8f8e1378bedbf7ecbf9647a2 (diff) | |
Use libdcp's compress_j2k; move Data into libdcp.
Diffstat (limited to 'src/lib/j2k_image_proxy.cc')
| -rw-r--r-- | src/lib/j2k_image_proxy.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 35073201c..f2434b23d 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -20,13 +20,13 @@ #include "j2k_image_proxy.h" #include "dcpomatic_socket.h" #include "image.h" -#include "data.h" #include "raw_convert.h" #include <dcp/openjpeg_image.h> #include <dcp/mono_picture_frame.h> #include <dcp/stereo_picture_frame.h> #include <dcp/colour_conversion.h> #include <dcp/rgb_xyz.h> +#include <dcp/j2k.h> #include <libcxml/cxml.h> #include <openjpeg.h> #include <libxml++/libxml++.h> @@ -39,6 +39,7 @@ using std::cout; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; +using dcp::Data; /** Construct a J2KImageProxy from a JPEG2000 file */ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size) |