Cleanup: fix more comments/guards (and add check script).

[libdcp.git] / src / j2k_transcode.h

diff --git a/src/j2k_transcode.h b/src/j2k_transcode.h
index 0687706d66504f700af6831b44b90ef6134ac483..1e14929330cb64672988ce82c4a3204ff53a0bd1 100644 (file)
--- a/src/j2k_transcode.h
+++ b/src/j2k_transcode.h
@@ -48,8 +48,6 @@ namespace dcp {
 class OpenJPEGImage;
 
 
-extern std::shared_ptr<OpenJPEGImage> decompress_j2k (uint8_t* data, int64_t size, int reduce);
-
 /** Decompress a JPEG2000 image to a bitmap
  *  @param data JPEG2000 data
  *  @param size Size of data in bytes
@@ -59,12 +57,15 @@ extern std::shared_ptr<OpenJPEGImage> decompress_j2k (uint8_t* data, int64_t siz
  *  This is useful for scaling 4K DCP images down to 2K.
  *  @return OpenJPEGImage
  */
-extern std::shared_ptr<OpenJPEGImage> decompress_j2k (ArrayData data, int reduce);
+extern std::shared_ptr<OpenJPEGImage> decompress_j2k (uint8_t const * data, int64_t size, int reduce);
+
+extern std::shared_ptr<OpenJPEGImage> decompress_j2k (Data const& data, int reduce);
+extern std::shared_ptr<OpenJPEGImage> decompress_j2k (std::shared_ptr<const Data> data, int reduce);
 
 /** @xyz Picture to compress.  Parts of xyz's data WILL BE OVERWRITTEN by libopenjpeg so xyz cannot be re-used
  *  after this call; see opj_j2k_encode where if l_reuse_data is false it will set l_tilec->data = l_img_comp->data.
  */
-extern ArrayData compress_j2k (std::shared_ptr<const OpenJPEGImage>, int bandwith, int frames_per_second, bool threed, bool fourk, std::string comment = "libdcp");
+extern ArrayData compress_j2k (std::shared_ptr<const OpenJPEGImage>, int bandwidth, int frames_per_second, bool threed, bool fourk, std::string comment = "libdcp");
 
 
 }