From 967dc3f4461d4b8caf809ebce7bdcb6e818809f0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 14 Nov 2012 21:58:47 +0000
Subject: Use ImageMagick for tiff decoding too.

---
 src/lib/decoder_factory.cc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/lib/decoder_factory.cc')

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index d4a91d8d9..bb6eff971 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -23,7 +23,6 @@
 
 #include <boost/filesystem.hpp>
 #include "ffmpeg_decoder.h"
-#include "tiff_decoder.h"
 #include "imagemagick_decoder.h"
 #include "film.h"
 
@@ -35,12 +34,8 @@ decoder_factory (
 	shared_ptr<Film> f, shared_ptr<const Options> o, Job* j
 	)
 {
-	if (boost::filesystem::is_directory (f->content_path ())) {
-		/* Assume a directory contains TIFFs */
-		return shared_ptr<Decoder> (new TIFFDecoder (f, o, j));
-	}
-
-	if (f->content_type() == STILL) {
+	if (boost::filesystem::is_directory (f->content_path()) || f->content_type() == STILL) {
+		/* A single image file, or a directory of them */
 		return shared_ptr<Decoder> (new ImageMagickDecoder (f, o, j));
 	}
 	
-- 
cgit v1.2.3