diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 18:14:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 18:14:10 +0100 |
| commit | bd8fa9a370f1739952c83107352baa08c79d095e (patch) | |
| tree | dafa3dae2db5439dc08e770fc4b09febac5f0374 /src/lib/imagemagick_decoder.cc | |
| parent | 44b57d623dec97a3f9955082f0b8a7a8d27b7518 (diff) | |
Merge FilmState / Film.
Diffstat (limited to 'src/lib/imagemagick_decoder.cc')
| -rw-r--r-- | src/lib/imagemagick_decoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc index 32c433d09..185fccd82 100644 --- a/src/lib/imagemagick_decoder.cc +++ b/src/lib/imagemagick_decoder.cc @@ -20,18 +20,18 @@ #include <iostream> #include <Magick++/Image.h> #include "imagemagick_decoder.h" -#include "film_state.h" #include "image.h" +#include "film.h" using namespace std; using namespace boost; ImageMagickDecoder::ImageMagickDecoder ( - boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Job* j, Log* l, bool minimal, bool ignore_length) - : Decoder (s, o, j, l, minimal, ignore_length) + boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j, bool minimal, bool ignore_length) + : Decoder (f, o, j, minimal, ignore_length) , _done (false) { - _magick_image = new Magick::Image (_fs->content_path ()); + _magick_image = new Magick::Image (_film->content_path ()); } Size |