Tighten a bit the RendererAgg API.

anntzer · anntzer · commit ac64e253f52e · 2020-07-02T22:32:07.000+02:00
The get_content_extents and tostring_rgba_minimized methods of
RendererAgg are used to implement 1) agg_filter and 2) rasterization in
MixedModeRenderer (i.e. for vector backends).  They can easily instead
be implemented at the Python level (i.e., via _get_nonzero_slices),
which makes it easier to plug in an alternative renderer (e.g.,
mplcairo) for rasterization in MixedModeRenderer.  I'm not convinced
_get_nonzero_slices needs to be exposed as public API (it's quite simple
anyways), but it could be if we absolutely want to present an
alternative for the deprecated methods.
diff --git a/doc/api/next_api_changes/deprecations/17788-AL.rst b/doc/api/next_api_changes/deprecations/17788-AL.rst
@@ -0,0 +1,3 @@
+``RendererAgg.get_content_extents``, ``RendererAgg.tostring_rgba_minimized``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... are deprecated.
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -119,8 +119,12 @@ def _update_methods(self):
         # self.draw_path_collection = self._renderer.draw_path_collection
         self.draw_quad_mesh = self._renderer.draw_quad_mesh
         self.copy_from_bbox = self._renderer.copy_from_bbox
-        self.get_content_extents = self._renderer.get_content_extents
 
+    @cbook.deprecated("3.4")  # Also needs to be removed at C-level.
+    def get_content_extents(self):
+        return self._renderer.get_content_extents()
+
+    @cbook.deprecated("3.4")
     def tostring_rgba_minimized(self):
         extents = self.get_content_extents()
         bbox = [[extents[0], self.height - (extents[1] + extents[3])],
@@ -367,23 +371,21 @@ def post_processing(image, dpi):
         The saved renderer is restored and the returned image from
         post_processing is plotted (using draw_image) on it.
         """
-
-        width, height = int(self.width), int(self.height)
-
-        buffer, (l, b, w, h) = self.tostring_rgba_minimized()
+        buf = np.asarray(self.buffer_rgba())
+        sly, slx = cbook._get_nonzero_slices(buf[..., 3])
+        buf_min = buf[sly, slx]
 
         self._renderer = self._filter_renderers.pop()
         self._update_methods()
 
-        if w > 0 and h > 0:
-            img = np.frombuffer(buffer, np.uint8)
-            img, ox, oy = post_processing(img.reshape((h, w, 4)) / 255.,
-                                          self.dpi)
+        if buf_min.size:
+            img, ox, oy = post_processing(buf_min / 255, self.dpi)
             gc = self.new_gc()
             if img.dtype.kind == 'f':
                 img = np.asarray(img * 255., np.uint8)
-            img = img[::-1]
-            self._renderer.draw_image(gc, l + ox, height - b - h + oy, img)
+            self._renderer.draw_image(
+                gc, slx.start + ox, int(self.height) - sly.stop + oy,
+                img[::-1])
 
 
 class FigureCanvasAgg(FigureCanvasBase):
diff --git a/lib/matplotlib/backends/backend_mixed.py b/lib/matplotlib/backends/backend_mixed.py
@@ -1,5 +1,6 @@
 import numpy as np
 
+from matplotlib import cbook
 from matplotlib.backends.backend_agg import RendererAgg
 from matplotlib.tight_bbox import process_figure_for_rasterizing
 
@@ -105,21 +106,19 @@ def stop_rasterizing(self):
             self._renderer = self._vector_renderer
 
             height = self._height * self.dpi
-            buffer, bounds = self._raster_renderer.tostring_rgba_minimized()
-            l, b, w, h = bounds
-            if w > 0 and h > 0:
-                image = np.frombuffer(buffer, dtype=np.uint8)
-                image = image.reshape((h, w, 4))
-                image = image[::-1]
+            buf = np.asarray(self._raster_renderer.buffer_rgba())
+            sly, slx = cbook._get_nonzero_slices(buf[..., 3])
+            buf_min = buf[sly, slx]
+            if buf_min.size:
                 gc = self._renderer.new_gc()
                 # TODO: If the mixedmode resolution differs from the figure's
                 #       dpi, the image must be scaled (dpi->_figdpi). Not all
                 #       backends support this.
                 self._renderer.draw_image(
                     gc,
-                    l * self._figdpi / self.dpi,
-                    (height-b-h) * self._figdpi / self.dpi,
-                    image)
+                    slx.start * self._figdpi / self.dpi,
+                    (height-sly.stop) * self._figdpi / self.dpi,
+                    buf_min[::-1])
             self._raster_renderer = None
             self._rasterizing = False
 
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -2162,6 +2162,24 @@ def _unmultiplied_rgba8888_to_premultiplied_argb32(rgba8888):
     return argb32
 
 
+def _get_nonzero_slices(buf):
+    """
+    Return the bounds of the nonzero region of a 2D array as a pair of slices.
+
+    ``buf[_get_nonzero_slices(buf)]`` is the smallest sub-rectangle in *buf*
+    that encloses all non-zero entries in *buf*.  If *buf* is fully zero, then
+    ``(slice(0, 0), slice(0, 0))`` is returned.
+    """
+    x_nz, = buf.any(axis=0).nonzero()
+    y_nz, = buf.any(axis=1).nonzero()
+    if len(x_nz) and len(y_nz):
+        l, r = x_nz[[0, -1]]
+        b, t = y_nz[[0, -1]]
+        return slice(b, t + 1), slice(l, r + 1)
+    else:
+        return slice(0, 0), slice(0, 0)
+
+
 def _pformat_subprocess(command):
     """Pretty-format a subprocess command for printing/logging purposes."""
     return (command if isinstance(command, str)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+``RendererAgg.get_content_extents``, ``RendererAgg.tostring_rgba_minimized``
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
	`3`	`+... are deprecated.`