Fix equals() with image subtitles to not compare unique IDs.

[libdcp.git] / src / j2k.h

diff --git a/src/j2k.h b/src/j2k.h
index 4f802a5a98b2a368b43360c942a96e99d72fdc62..fcaa28e28c28a7903c886c4f64077df7599b13dc 100644 (file)
--- a/src/j2k.h
+++ b/src/j2k.h
@@ -31,7 +31,8 @@
     files in the program, then also delete it here.
 */
 
-#include "data.h"
+
+#include "array_data.h"
 #include <boost/shared_ptr.hpp>
 #include <stdint.h>
 
@@ -40,7 +41,7 @@ namespace dcp {
 class OpenJPEGImage;
 
 extern boost::shared_ptr<OpenJPEGImage> decompress_j2k (uint8_t* data, int64_t size, int reduce);
-extern boost::shared_ptr<OpenJPEGImage> decompress_j2k (Data data, int reduce);
-extern Data compress_j2k (boost::shared_ptr<const OpenJPEGImage>, int bandwith, int frames_per_second, bool threed, bool fourk);
+extern boost::shared_ptr<OpenJPEGImage> decompress_j2k (ArrayData data, int reduce);
+extern ArrayData compress_j2k (boost::shared_ptr<const OpenJPEGImage>, int bandwith, int frames_per_second, bool threed, bool fourk, std::string comment = "libdcp");
 
 }