Use make_shared<>.

[dcpomatic.git] / src / lib / j2k_image_proxy.cc

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index f2434b23d49ec4e346afc188408ed527adeb6b66..35d70162ccfb014b695d5ef65f8b9d48488a2499 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -28,8 +29,8 @@
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k.h>
 #include <libcxml/cxml.h>
-#include <openjpeg.h>
 #include <libxml++/libxml++.h>
+#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -39,6 +40,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using boost::make_shared;
 using dcp::Data;
 
 /** Construct a J2KImageProxy from a JPEG2000 file */
@@ -95,8 +97,8 @@ 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) {
@@ -107,7 +109,7 @@ J2KImageProxy::image (optional<dcp::NoteHandler>) const
                }
        }
 
-       shared_ptr<Image> image (new Image (pixel_format(), _size, true));
+       shared_ptr<Image> image = make_shared<Image> (pixel_format(), _size, true);
 
        /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
           the data is 12-bit either way.
@@ -165,7 +167,7 @@ J2KImageProxy::pixel_format () const
 {
        ensure_j2k ();
 
-       if (_j2k->opj_image()->color_space == CLRSPC_SRGB) {
+       if (_j2k->srgb ()) {
                return AV_PIX_FMT_RGB48LE;
        }