From 752bba7eb39d6f775a3ecb3ca3e19d7884626a4e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 4 Nov 2012 17:09:43 +0000 Subject: Revert "Remove minimal flag." This reverts commit ac712b45bad948fc8f38cf4fa48a529f2024c7f5. --- src/lib/decoder_factory.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/lib/decoder_factory.cc') 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_factory (shared_ptr f, shared_ptr o, Job* j) +decoder_factory ( + shared_ptr f, shared_ptr o, Job* j, bool minimal = false + ) { if (boost::filesystem::is_directory (f->content_path ())) { /* Assume a directory contains TIFFs */ - return shared_ptr (new TIFFDecoder (f, o, j)); + return shared_ptr (new TIFFDecoder (f, o, j, minimal)); } if (f->content_type() == STILL) { - return shared_ptr (new ImageMagickDecoder (f, o, j)); + return shared_ptr (new ImageMagickDecoder (f, o, j, minimal)); } - return shared_ptr (new FFmpegDecoder (f, o, j)); + return shared_ptr (new FFmpegDecoder (f, o, j, minimal)); } -- cgit v1.2.3