diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-04 17:09:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-04 17:09:43 +0000 |
| commit | 752bba7eb39d6f775a3ecb3ca3e19d7884626a4e (patch) | |
| tree | 235b558aec10da89dca7484686ff035cbef4811c /src/lib/decoder_factory.cc | |
| parent | ac712b45bad948fc8f38cf4fa48a529f2024c7f5 (diff) | |
Revert "Remove minimal flag."
This reverts commit ac712b45bad948fc8f38cf4fa48a529f2024c7f5.
Diffstat (limited to 'src/lib/decoder_factory.cc')
| -rw-r--r-- | src/lib/decoder_factory.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc index c3a6965e6..287bba0da 100644 --- a/src/lib/decoder_factory.cc +++ b/src/lib/decoder_factory.cc @@ -31,16 +31,18 @@ using std::string; using boost::shared_ptr; shared_ptr<Decoder> -decoder_factory (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j) +decoder_factory ( + shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, bool minimal = false + ) { if (boost::filesystem::is_directory (f->content_path ())) { /* Assume a directory contains TIFFs */ - return shared_ptr<Decoder> (new TIFFDecoder (f, o, j)); + return shared_ptr<Decoder> (new TIFFDecoder (f, o, j, minimal)); } if (f->content_type() == STILL) { - return shared_ptr<Decoder> (new ImageMagickDecoder (f, o, j)); + return shared_ptr<Decoder> (new ImageMagickDecoder (f, o, j, minimal)); } - return shared_ptr<Decoder> (new FFmpegDecoder (f, o, j)); + return shared_ptr<Decoder> (new FFmpegDecoder (f, o, j, minimal)); } |
