Merge branch 'v1.0.x'

leejjoon · leejjoon · commit d623307ff88f · 2011-05-11T13:16:09.000+09:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1797,6 +1797,7 @@ def print_jpg(self, filename_or_obj, *args, **kwargs):
             from backends.backend_agg import FigureCanvasAgg # lazy import
             agg = self.switch_backends(FigureCanvasAgg)
             buf, size = agg.print_to_buffer()
+            if kwargs.pop("dryrun", False): return
             image = Image.frombuffer('RGBA', size, buf, 'raw', 'RGBA', 0, 1)
             options = cbook.restrict_dict(kwargs, ['quality', 'optimize',
                                                    'progressive'])
@@ -1808,6 +1809,7 @@ def print_tif(self, filename_or_obj, *args, **kwargs):
             from backends.backend_agg import FigureCanvasAgg # lazy import
             agg = self.switch_backends(FigureCanvasAgg)
             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)
         print_tiff = print_tif
diff --git a/lib/matplotlib/tight_bbox.py b/lib/matplotlib/tight_bbox.py
@@ -125,7 +125,7 @@ def process_figure_for_rasterizing(figure,
 
 
 _adjust_bbox_handler_d = {}
-for format in ["png", "raw", "rgba"]:
+for format in ["png", "raw", "rgba", "jpg", "jpeg", "tiff"]:
     _adjust_bbox_handler_d[format] = adjust_bbox_png
 for format in ["pdf", "eps", "svg", "svgz"]:
     _adjust_bbox_handler_d[format] = adjust_bbox_pdf
