diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-26 23:41:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-26 23:41:02 +0100 |
| commit | f861018389acd9d277fe34d7621182b9b54f977f (patch) | |
| tree | 499bae7640ce99a13c31ea9c870d426084480aec /src/lib/image.h | |
| parent | f09c6b53f155de601900afa90045059b20310c0d (diff) | |
| parent | 86011ad6b4ea0004a51c59b0563cf89c0947546d (diff) | |
Merge master; fix crash on new film.
Diffstat (limited to 'src/lib/image.h')
| -rw-r--r-- | src/lib/image.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/image.h b/src/lib/image.h index 1d7d75dfc..de03d0e3f 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -131,6 +131,7 @@ class SimpleImage : public Image public: SimpleImage (AVPixelFormat, libdcp::Size, bool); SimpleImage (SimpleImage const &); + SimpleImage (boost::shared_ptr<const Image>); SimpleImage& operator= (SimpleImage const &); ~SimpleImage (); |