/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic 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,
+ DCP-o-matic 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 DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "j2k_image_proxy.h"
#include "dcpomatic_socket.h"
#include "image.h"
-#include "data.h"
#include "raw_convert.h"
#include <dcp/openjpeg_image.h>
#include <dcp/mono_picture_frame.h>
#include <dcp/stereo_picture_frame.h>
#include <dcp/colour_conversion.h>
#include <dcp/rgb_xyz.h>
+#include <dcp/j2k.h>
#include <libcxml/cxml.h>
-#include <openjpeg.h>
#include <libxml++/libxml++.h>
#include <iostream>
using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
+using dcp::Data;
/** Construct a J2KImageProxy from a JPEG2000 file */
J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
}
shared_ptr<Image>
-J2KImageProxy::image (optional<dcp::NoteHandler> note) const
+J2KImageProxy::image (optional<dcp::NoteHandler>) const
{
ensure_j2k ();
- if (_j2k->opj_image()->comps[0].prec < 12) {
- int const shift = 12 - _j2k->opj_image()->comps[0].prec;
+ if (_j2k->precision(0) < 12) {
+ int const shift = 12 - _j2k->precision (0);
for (int c = 0; c < 3; ++c) {
int* p = _j2k->data (c);
for (int y = 0; y < _j2k->size().height; ++y) {
{
ensure_j2k ();
- if (_j2k->opj_image()->color_space == CLRSPC_SRGB) {
+ if (_j2k->srgb ()) {
return AV_PIX_FMT_RGB48LE;
}