projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
image.h
diff --git
a/src/lib/image.h
b/src/lib/image.h
index 31035d272d99a33f4791ff210d0cff23db47e991..de03d0e3f60485a8d316deb00cef21ad80bc92f7 100644
(file)
--- a/
src/lib/image.h
+++ b/
src/lib/image.h
@@
-21,8
+21,8
@@
* @brief A set of classes to describe video images.
*/
* @brief A set of classes to describe video images.
*/
-#ifndef D
VD
OMATIC_IMAGE_H
-#define D
VD
OMATIC_IMAGE_H
+#ifndef D
CP
OMATIC_IMAGE_H
+#define D
CP
OMATIC_IMAGE_H
#include <string>
#include <boost/shared_ptr.hpp>
#include <string>
#include <boost/shared_ptr.hpp>
@@
-70,8
+70,6
@@
public:
virtual bool aligned () const = 0;
virtual bool aligned () const = 0;
- virtual boost::shared_ptr<Image> clone () const = 0;
-
int components () const;
int lines (int) const;
int components () const;
int lines (int) const;
@@
-120,9
+118,6
@@
private:
/* Not allowed */
FilterBufferImage (FilterBufferImage const &);
FilterBufferImage& operator= (FilterBufferImage const &);
/* Not allowed */
FilterBufferImage (FilterBufferImage const &);
FilterBufferImage& operator= (FilterBufferImage const &);
- boost::shared_ptr<Image> clone () const {
- assert (false);
- }
AVFilterBufferRef* _buffer;
int* _line_size;
AVFilterBufferRef* _buffer;
int* _line_size;
@@
-136,6
+131,7
@@
class SimpleImage : public Image
public:
SimpleImage (AVPixelFormat, libdcp::Size, bool);
SimpleImage (SimpleImage const &);
public:
SimpleImage (AVPixelFormat, libdcp::Size, bool);
SimpleImage (SimpleImage const &);
+ SimpleImage (boost::shared_ptr<const Image>);
SimpleImage& operator= (SimpleImage const &);
~SimpleImage ();
SimpleImage& operator= (SimpleImage const &);
~SimpleImage ();
@@
-144,7
+140,6
@@
public:
int * stride () const;
libdcp::Size size () const;
bool aligned () const;
int * stride () const;
libdcp::Size size () const;
bool aligned () const;
- boost::shared_ptr<Image> clone () const;
protected:
void allocate ();
protected:
void allocate ();