projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to fix build on OS X.
[libdcp.git]
/
src
/
mono_picture_frame.h
diff --git
a/src/mono_picture_frame.h
b/src/mono_picture_frame.h
index cc6096cd8c705093b8333c48ad989a5bdbe48391..68e4edf8fc39c006dd3c6c14ce7a4f5e0442bc8e 100644
(file)
--- a/
src/mono_picture_frame.h
+++ b/
src/mono_picture_frame.h
@@
-25,6
+25,7
@@
#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
#include <string>
#include <stdint.h>
#include <string>
#include <stdint.h>
@@
-37,7
+38,7
@@
namespace ASDCP {
namespace dcp {
namespace dcp {
-class
ARGBFram
e;
+class
OpenJPEGImag
e;
/** @class MonoPictureFrame
* @brief A single frame of a 2D (monoscopic) picture asset.
/** @class MonoPictureFrame
* @brief A single frame of a 2D (monoscopic) picture asset.
@@
-45,11
+46,15
@@
class ARGBFrame;
class MonoPictureFrame : public boost::noncopyable
{
public:
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 ();
~MonoPictureFrame ();
- boost::shared_ptr<ARGBFrame> argb_frame (int reduce = 0, float srgb_gamma = 2.4) const;
+ boost::shared_ptr<OpenJPEGImage> xyz_image (int reduce = 0) const;
+
uint8_t const * j2k_data () const;
uint8_t const * j2k_data () const;
+ uint8_t* j2k_data ();
int j2k_size () const;
private:
int j2k_size () const;
private: