Use ImageMagick for tiff decoding too.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 1bf50378b..6506d0177 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -29,7 +29,8 @@ public:
 	ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
 
 	float frames_per_second () const {
-		return static_frames_per_second ();
+		/* We don't know */
+		return 0;
 	}
 
 	Size native_size () const;
@@ -50,10 +51,6 @@ public:
 		return false;
 	}
 
-	static float static_frames_per_second () {
-		return 24;
-	}
-
 protected:
 	bool pass ();
 	PixelFormat pixel_format () const;
@@ -77,6 +74,6 @@ protected:
 	}
 
 private:
-	Magick::Image* _magick_image;
-	bool _done;
+	std::list<std::string> _files;
+	std::list<std::string>::iterator _iter;
 };