Remove some unnecessary includes.

[libdcp.git] / src / mono_picture_frame.h

diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index aaafe398c42668e0988674c009bbe7cdf488e507..9e7a992670fbf88bd3d51afcd8ab8d7fa27325f4 100644 (file)
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -38,7 +38,7 @@ namespace ASDCP {
 
 namespace dcp {
 
-class ARGBFrame;
+class OpenJPEGImage;
 
 /** @class MonoPictureFrame
  *  @brief A single frame of a 2D (monoscopic) picture asset.
@@ -46,13 +46,13 @@ class ARGBFrame;
 class MonoPictureFrame : public boost::noncopyable
 {
 public:
-       MonoPictureFrame (boost::filesystem::path mxf_path, int n, ASDCP::AESDecContext *);
+       MonoPictureFrame (boost::filesystem::path path, int n, ASDCP::AESDecContext *);
        MonoPictureFrame (boost::filesystem::path path);
-       MonoPictureFrame ();
+       MonoPictureFrame (uint8_t const * data, int size);
        ~MonoPictureFrame ();
 
-       boost::shared_ptr<ARGBFrame> argb_frame (int reduce = 0) const;
-       void rgb_frame (uint16_t* buffer, boost::optional<NoteHandler> note = boost::optional<NoteHandler> ()) 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;