projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg
[dcpomatic.git]
/
src
/
lib
/
image.h
diff --git
a/src/lib/image.h
b/src/lib/image.h
index f71a47b0c7c9a1c3cf9f4e66105f817689a29fb9..73f2313c1a03f297c22960d5ba290aa83d927fb9 100644
(file)
--- a/
src/lib/image.h
+++ b/
src/lib/image.h
@@
-33,11
+33,12
@@
extern "C" {
}
#include <dcp/colour_conversion.h>
#include <boost/shared_ptr.hpp>
}
#include <dcp/colour_conversion.h>
#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
struct AVFrame;
class Socket;
struct AVFrame;
class Socket;
-class Image
+class Image
: public boost::enable_shared_from_this<Image>
{
public:
Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
{
public:
Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels = 0);
@@
-80,7
+81,9
@@
public:
size_t memory_used () const;
size_t memory_used () const;
- static boost::shared_ptr<Image> ensure_aligned (boost::shared_ptr<Image> image);
+ dcp::Data as_png () const;
+
+ static boost::shared_ptr<const Image> ensure_aligned (boost::shared_ptr<const Image> image);
private:
friend struct pixel_formats_test;
private:
friend struct pixel_formats_test;