projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix tests again on Windows.
[libdcp.git]
/
src
/
openjpeg_image.cc
diff --git
a/src/openjpeg_image.cc
b/src/openjpeg_image.cc
index 3594b2bde540e1579510cae18717e20ec21a4043..c963d2bb9a1cb7308c09872bddd2b56d4c0004f9 100644
(file)
--- a/
src/openjpeg_image.cc
+++ b/
src/openjpeg_image.cc
@@
-33,7
+33,7
@@
/** @file src/openjpeg_image.cc
/** @file src/openjpeg_image.cc
- * @brief OpenJPEGImage class
.
+ * @brief OpenJPEGImage class
*/
*/
@@
-46,11
+46,6
@@
using namespace dcp;
using namespace dcp;
-#ifdef LIBDCP_OPENJPEG1
-#define OPJ_CLRSPC_SRGB CLRSPC_SRGB
-#endif
-
-
OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
: _opj_image (image)
{
OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
: _opj_image (image)
{
@@
-58,12
+53,6
@@
OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
}
}
-#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)));
OpenJPEGImage::OpenJPEGImage (OpenJPEGImage const & other)
{
_opj_image = reinterpret_cast<opj_image_t*>(malloc(sizeof(opj_image_t)));
@@
-130,7
+119,7
@@
OpenJPEGImage::create (Size size)
/* XXX: is this _SRGB right? */
_opj_image = opj_image_create (3, &cmptparm[0], OPJ_CLRSPC_SRGB);
/* XXX: is this _SRGB right? */
_opj_image = opj_image_create (3, &cmptparm[0], OPJ_CLRSPC_SRGB);
- if (_opj_image ==
0
) {
+ if (_opj_image ==
nullptr
) {
throw std::runtime_error ("could not create libopenjpeg image");
}
throw std::runtime_error ("could not create libopenjpeg image");
}