Fix erroneous reports of unresolved assets when checking OV/VF pairs.

[libdcp.git] / src / openjpeg_image.h

diff --git a/src/openjpeg_image.h b/src/openjpeg_image.h
index 9687c8870d58326c9188cb2abf02b40ffeebe563..002e2a834df16c5120127daca1161b25e7bcb318 100644 (file)
--- a/src/openjpeg_image.h
+++ b/src/openjpeg_image.h
@@ -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.h
@@ -31,17 +45,20 @@ namespace dcp {
 /** @class OpenJPEGImage
  *  @brief A wrapper of libopenjpeg's opj_image_t.
  */
-class OpenJPEGImage : public boost::noncopyable
+class OpenJPEGImage
 {
 public:
-       OpenJPEGImage (opj_image_t *);
-       OpenJPEGImage (Size);
+       explicit OpenJPEGImage (opj_image_t *);
+       explicit OpenJPEGImage (OpenJPEGImage const & other);
+       explicit OpenJPEGImage (Size);
+       OpenJPEGImage (uint8_t const * in_16, dcp::Size size, int stride);
        ~OpenJPEGImage ();
 
        int* data (int) const;
-       dcp::Size size () const;
+       Size size () const;
        int precision (int component) const;
        bool srgb () const;
+       int factor (int component) const;
 
        /** @return Pointer to opj_image_t struct.  The caller
         *  must not delete this.
@@ -51,6 +68,8 @@ public:
        }
 
 private:
+       void create (Size size);
+
        opj_image_t* _opj_image; ///< opj_image_t that we are managing
 };