ENH: add imagemagick pipe writer

jakevdp · jakevdp · commit ab80b7e0e44b · 2012-10-05T21:46:32.000-07:00
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -455,19 +455,34 @@ class ImageMagickBase:
     exec_key = 'animation.convert_path'
     args_key = 'animation.convert_args'
 
+    @property
+    def delay(self):
+        return 100. / self.fps
+
     @property
     def output_args(self):
         return [self.outfile]
 
 
+@writers.register('imagemagick')
+class ImageMagickWriter(MovieWriter, ImageMagickBase):
+    def _args(self):
+        return ([self.bin_path(),
+                 '-size', '%ix%i' % self.frame_size, '-depth', '8',
+                 '-delay', str(self.delay), '-loop', '0',
+                 '%s:-' % self.frame_format]
+                + self.output_args)
+
+
 @writers.register('imagemagick_file')
 class ImageMagickFileWriter(FileMovieWriter, ImageMagickBase):
-    supported_formats = ['png']
+    supported_formats = ['png', 'jpeg', 'ppm', 'tiff', 'sgi', 'bmp',
+                         'pbm', 'raw', 'rgba']
 
     def _args(self):
-        delay = 100. / self.fps
-        return [self.bin_path(), '-delay', str(delay), '-loop', '0',
-                '%s*.%s' % (self.temp_prefix, self.frame_format)] + self.output_args
+        return ([self.bin_path(), '-delay', str(self.delay), '-loop', '0',
+                 '%s*.%s' % (self.temp_prefix, self.frame_format)]
+                + self.output_args)
 
 
 class Animation(object):
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -323,7 +323,8 @@ def validate_hinting(s):
                                            ['xelatex', 'lualatex', 'pdflatex'])
 
 validate_movie_writer = ValidateInStrings('animation.writer',
-    ['ffmpeg', 'ffmpeg_file', 'mencoder', 'mencoder_file', 'imagemagick_file'])
+    ['ffmpeg', 'ffmpeg_file', 'mencoder', 'mencoder_file',
+     'imagemagick', 'imagemagick_file'])
 
 validate_movie_frame_fmt = ValidateInStrings('animation.frame_format',
     ['png', 'jpeg', 'tiff', 'raw', 'rgba'])
