X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fopenjpeg_image.cc;h=32d1da3f0a7092a803674c0ec8f589ec7f93e51c;hb=3956d410a1fce4fe3b02cd7c52d9717e29371f3b;hp=d8bb0fcbfb9e170b1cf9de3b3299a35efb489977;hpb=41ab9a3ad26bb2fd17eca4d99780c46e315c393a;p=libdcp.git

diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc
index d8bb0fcb..32d1da3f 100644
--- a/src/openjpeg_image.cc
+++ b/src/openjpeg_image.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/openjpeg_image.cc
@@ -23,10 +37,15 @@
 
 #include "openjpeg_image.h"
 #include "dcp_assert.h"
+#include <openjpeg.h>
 #include <stdexcept>
 
 using namespace dcp;
 
+#ifdef LIBDCP_OPENJPEG1
+#define OPJ_CLRSPC_SRGB CLRSPC_SRGB
+#endif
+
 /** Construct an OpenJPEGImage, taking ownership of the opj_image_t */
 OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
 	: _opj_image (image)
@@ -40,7 +59,7 @@ OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
 OpenJPEGImage::OpenJPEGImage (Size size)
 {
 	opj_image_cmptparm_t cmptparm[3];
-	
+
 	for (int i = 0; i < 3; ++i) {
 		cmptparm[i].dx = 1;
 		cmptparm[i].dy = 1;
@@ -54,7 +73,7 @@ OpenJPEGImage::OpenJPEGImage (Size size)
 	}
 
 	/* XXX: is this _SRGB right? */
-	_opj_image = opj_image_create (3, &cmptparm[0], CLRSPC_SRGB);
+	_opj_image = opj_image_create (3, &cmptparm[0], OPJ_CLRSPC_SRGB);
 	if (_opj_image == 0) {
 		throw std::runtime_error ("could not create libopenjpeg image");
 	}
@@ -88,3 +107,15 @@ OpenJPEGImage::size () const
 	/* XXX: this may not be right; x0 and y0 can presumably be non-zero */
 	return dcp::Size (_opj_image->x1, _opj_image->y1);
 }
+
+int
+OpenJPEGImage::precision (int component) const
+{
+	return _opj_image->comps[component].prec;
+}
+
+bool
+OpenJPEGImage::srgb () const
+{
+	return _opj_image->color_space == OPJ_CLRSPC_SRGB;
+}