diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-11-09 16:02:01 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-11-09 16:02:01 +0000 |
| commit | 9abc1b14a64da49b8de4979775961feaeac88739 (patch) | |
| tree | 9e7b1c12b0a60870b0a7d5c1766916ad5376ff3d /src | |
| parent | 6761022cce1187ad11ddf0b8b7f2d6f7fcf6e64e (diff) | |
| parent | 392a91d017d6d0207da0cc24db9583063ab58248 (diff) | |
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/openjpeg_image.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc index 401b6aa1..e71d8141 100644 --- a/src/openjpeg_image.cc +++ b/src/openjpeg_image.cc @@ -53,6 +53,11 @@ OpenJPEGImage::OpenJPEGImage (opj_image_t* image) DCP_ASSERT (_opj_image->numcomps == 3); } +#ifdef LIBDCP_OPENJPEG1 +typedef int32_t OPJ_INT32; +typedef uint8_t OPJ_BYTE; +#endif + OpenJPEGImage::OpenJPEGImage (OpenJPEGImage const & other) { _opj_image = reinterpret_cast<opj_image_t*> (malloc (sizeof (opj_image_t))); |