Merge pull request #17 from tacaswell/image-interpolation

mdboom · mdboom · commit 83f4bc9db0dc · 2016-02-17T09:47:56.000-05:00
Image interpolation
diff --git a/lib/matplotlib/backends/backend_mixed.py b/lib/matplotlib/backends/backend_mixed.py
@@ -52,7 +52,7 @@ def __init__(self, figure, width, height, dpi, vector_renderer,
         # A reference to the figure is needed as we need to change
         # the figure dpi before and after the rasterization. Although
         # this looks ugly, I couldn't find a better solution. -JJL
-        self.figure=figure
+        self.figure = figure
         self._figdpi = figure.get_dpi()
 
         self._bbox_inches_restore = bbox_inches_restore
@@ -69,6 +69,7 @@ def __init__(self, figure, width, height, dpi, vector_renderer,
         draw_gouraud_triangles option_scale_image
         _text2path _get_text_path_transform height width
         """.split()
+
     def _set_current_renderer(self, renderer):
         self._renderer = renderer
 
@@ -91,7 +92,7 @@ def start_rasterizing(self):
         # change the dpi of the figure temporarily.
         self.figure.set_dpi(self.dpi)
 
-        if self._bbox_inches_restore: # when tight bbox is used
+        if self._bbox_inches_restore:  # when tight bbox is used
             r = process_figure_for_rasterizing(self.figure,
                                                self._bbox_inches_restore)
             self._bbox_inches_restore = r
@@ -115,7 +116,7 @@ def stop_rasterizing(self):
         if self._rasterizing == 0:
             self._set_current_renderer(self._vector_renderer)
 
-            width, height = self._width * self.dpi, self._height * self.dpi
+            height = self._height * self.dpi
             buffer, bounds = self._raster_renderer.tostring_rgba_minimized()
             l, b, w, h = bounds
             if w > 0 and h > 0:
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1525,8 +1525,10 @@ def writeTrailer(self):
 class RendererPdf(RendererBase):
     afm_font_cache = maxdict(50)
 
-    def __init__(self, file, image_dpi):
+    def __init__(self, file, image_dpi, height, width):
         RendererBase.__init__(self)
+        self.height = height
+        self.width = width
         self.file = file
         self.gc = self.new_gc()
         self.mathtext_parser = MathTextParser("Pdf")
@@ -2517,7 +2519,7 @@ def print_pdf(self, filename, **kwargs):
             _bbox_inches_restore = kwargs.pop("bbox_inches_restore", None)
             renderer = MixedModeRenderer(
                 self.figure, width, height, image_dpi,
-                RendererPdf(file, image_dpi),
+                RendererPdf(file, image_dpi, height, width),
                 bbox_inches_restore=_bbox_inches_restore)
             self.figure.draw(renderer)
             renderer.finalize()
diff --git a/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.pdf b/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.png b/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.png
diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -102,11 +102,11 @@ def test_composite_image():
     plt.rcParams['image.composite_image'] = True
     with PdfPages(io.BytesIO()) as pdf:
         fig.savefig(pdf, format="pdf")
-        assert len(pdf._file.images.keys()) == 1
+        assert len(pdf._file._images.keys()) == 1
     plt.rcParams['image.composite_image'] = False
     with PdfPages(io.BytesIO()) as pdf:
         fig.savefig(pdf, format="pdf")
-        assert len(pdf._file.images.keys()) == 2
+        assert len(pdf._file._images.keys()) == 2
 
 
 @image_comparison(baseline_images=['hatching_legend'],
diff --git a/lib/matplotlib/tests/test_coding_standards.py b/lib/matplotlib/tests/test_coding_standards.py
@@ -227,7 +227,6 @@ def test_pep8_conformance_installed_files():
                           'backends/backend_gtkagg.py',
                           'backends/backend_gtkcairo.py',
                           'backends/backend_macosx.py',
-                          'backends/backend_mixed.py',
                           'backends/backend_pgf.py',
                           'backends/backend_ps.py',
                           'backends/backend_svg.py',
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -21,6 +21,7 @@
 from nose.tools import assert_raises
 from numpy.testing import (
     assert_array_equal, assert_array_almost_equal, assert_allclose)
+from matplotlib.testing.noseclasses import KnownFailureTest
 
 
 try:
@@ -97,6 +98,8 @@ def test_image_python_io():
     buffer.seek(0)
     plt.imread(buffer)
 
+
+@cleanup
 @knownfailureif(not HAS_PIL)
 def test_imread_pil_uint16():
     img = plt.imread(os.path.join(os.path.dirname(__file__),
@@ -113,6 +116,8 @@ def test_imread_pil_uint16():
 #     plt.imread(fname)
 #     os.remove(fname)
 
+
+@cleanup
 def test_imsave():
     # The goal here is that the user can specify an output logical DPI
     # for the image, but this will not actually add any extra pixels
@@ -401,8 +406,7 @@ def test_rasterize_dpi():
     rcParams['savefig.dpi'] = 10
 
 
-@image_comparison(baseline_images=['bbox_image_inverted'],
-                  extensions=['png', 'pdf'])
+@cleanup
 def test_bbox_image_inverted():
     # This is just used to produce an image to feed to BboxImage
     fig = plt.figure()
@@ -416,6 +420,7 @@ def test_bbox_image_inverted():
 
     bbox_im = BboxImage(Bbox([[100, 100], [0, 0]]))
     bbox_im.set_data(image)
+    bbox_im.set_clip_on(False)
     axes.add_artist(bbox_im)
 
 
@@ -552,6 +557,7 @@ def test_log_scale_image():
     ax.set_yscale('log')
 
 
+
 @image_comparison(baseline_images=['rotate_image'],
                   remove_text=True)
 def test_rotate_image():
