Merge pull request #970 from cgohlke/master

mdboom · mdboom · commit 6a362e435ae0 · 2012-07-01T15:20:55.000-07:00
Fix tiff and jpeg export via PIL
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1883,7 +1883,7 @@ def print_jpg(self, filename_or_obj, *args, **kwargs):
             image = Image.frombuffer('RGBA', size, buf, 'raw', 'RGBA', 0, 1)
             options = cbook.restrict_dict(kwargs, ['quality', 'optimize',
                                                    'progressive'])
-            return image.save(filename_or_obj, **options)
+            return image.save(filename_or_obj, format='jpeg', **options)
         print_jpeg = print_jpg
 
         filetypes['tif'] = filetypes['tiff'] = 'Tagged Image File Format'
@@ -1893,7 +1893,7 @@ def print_tif(self, filename_or_obj, *args, **kwargs):
             buf, size = agg.print_to_buffer()
             if kwargs.pop("dryrun", False): return
             image = Image.frombuffer('RGBA', size, buf, 'raw', 'RGBA', 0, 1)
-            return image.save(filename_or_obj)
+            return image.save(filename_or_obj, format='tiff')
         print_tiff = print_tif
 
     def get_supported_filetypes(self):
