Add some explicit declarations to constructors.

[libdcp.git] / src / mono_picture_frame.h

diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index 78728fbf2876ee38020079d1b04bb2aaf849dd0d..ec213ac268d283a9db49604f921f3b80d3744b6c 100644 (file)
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -1,20 +1,20 @@
 /*
     Copyright (C) 2012-2014 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/>.
 */
 
 /** @file  src/mono_picture_frame.h
@@ -25,19 +25,21 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
 #include <string>
 #include <stdint.h>
 
 namespace ASDCP {
        namespace JP2K {
                class FrameBuffer;
+               class MXFReader;
        }
        class AESDecContext;
 }
 
 namespace dcp {
 
-class ARGBFrame;
+class OpenJPEGImage;
 
 /** @class MonoPictureFrame
  *  @brief A single frame of a 2D (monoscopic) picture asset.
@@ -45,18 +47,21 @@ class ARGBFrame;
 class MonoPictureFrame : public boost::noncopyable
 {
 public:
-       MonoPictureFrame (boost::filesystem::path mxf_path, int n, ASDCP::AESDecContext *);
-       MonoPictureFrame (boost::filesystem::path path);
-       MonoPictureFrame ();
+       explicit MonoPictureFrame (boost::filesystem::path path);
+       MonoPictureFrame (uint8_t const * data, int size);
        ~MonoPictureFrame ();
 
-       boost::shared_ptr<ARGBFrame> argb_frame (int reduce = 0, float srgb_gamma = 2.4) const;
-       void rgb_frame (uint8_t* buffer) const;
+       boost::shared_ptr<OpenJPEGImage> xyz_image (int reduce = 0) const;
+
        uint8_t const * j2k_data () const;
        uint8_t* j2k_data ();
        int j2k_size () const;
 
 private:
+       friend class MonoPictureAssetReader;
+
+       MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, ASDCP::AESDecContext *);
+
        ASDCP::JP2K::FrameBuffer* _buffer;
 };