projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix erroneous extra character.
[libdcp.git]
/
src
/
mono_picture_frame.h
diff --git
a/src/mono_picture_frame.h
b/src/mono_picture_frame.h
index 0eedfb95033d1030fbefe504fd0a5dfbf3ac7549..9e7a992670fbf88bd3d51afcd8ab8d7fa27325f4 100644
(file)
--- a/
src/mono_picture_frame.h
+++ b/
src/mono_picture_frame.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
3
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,10
+17,17
@@
*/
*/
+/** @file src/mono_picture_frame.h
+ * @brief MonoPictureFrame class.
+ */
+
+#include "types.h"
+#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>
-#include <boost/shared_ptr.hpp>
-#include "types.h"
namespace ASDCP {
namespace JP2K {
namespace ASDCP {
namespace JP2K {
@@
-29,19
+36,25
@@
namespace ASDCP {
class AESDecContext;
}
class AESDecContext;
}
-namespace
lib
dcp {
+namespace dcp {
-class
ARGBFram
e;
+class
OpenJPEGImag
e;
-/** A single frame of a 2D (monoscopic) picture asset */
-class MonoPictureFrame
+/** @class MonoPictureFrame
+ * @brief A single frame of a 2D (monoscopic) picture asset.
+ */
+class MonoPictureFrame : public boost::noncopyable
{
public:
{
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 (uint8_t const * data, int size);
~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: