Merge pull request #14454 from anntzer/svg.image_inline

tacaswell · web-flow · commit 7c224b52c6f5 · 2019-06-08T16:40:50.000-04:00
Simplify implementation of svg.image_inline.
diff --git a/doc/api/next_api_changes/2019-06-10-AL.rst b/doc/api/next_api_changes/2019-06-10-AL.rst
@@ -0,0 +1,10 @@
+RendererSVG now uses a single counter for externally written images
+```````````````````````````````````````````````````````````````````
+
+When using `RendererSVG` with ``rcParams["svg.image_inline"] ==
+True``, externally written images now use a single counter even if the
+``renderer.basename`` attribute is overwritten, rather than a counter per
+basename.
+
+This change will only affect you if you used ``rcParams["svg.image_inline"] = True``
+(the default is False) *and* manually modified ``renderer.basename``.
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -3,6 +3,7 @@
 import gzip
 import hashlib
 import io
+import itertools
 import logging
 import re
 import uuid
@@ -278,14 +279,11 @@ def __init__(self, width, height, svgwriter, basename=None, image_dpi=72):
         self.image_dpi = image_dpi  # actual dpi at which we rasterize stuff
 
         self._groupd = {}
-        if not rcParams['svg.image_inline']:
-            assert basename is not None
-            self.basename = basename
-            self._imaged = {}
+        self.basename = basename
+        self._image_counter = itertools.count()
         self._clipd = OrderedDict()
         self._markers = {}
         self._path_collection_id = 0
-        self._imaged = {}
         self._hatchd = OrderedDict()
         self._has_gouraud = False
         self._n_gradients = 0
@@ -830,10 +828,11 @@ def draw_image(self, gc, x, y, im, transform=None):
                 "data:image/png;base64,\n" +
                 base64.b64encode(bytesio.getvalue()).decode('ascii'))
         else:
-            self._imaged[self.basename] = (
-                self._imaged.get(self.basename, 0) + 1)
-            filename = '%s.image%d.png' % (
-                self.basename, self._imaged[self.basename])
+            if self.basename is None:
+                raise ValueError("Cannot save image data to filesystem when "
+                                 "writing SVG to an in-memory buffer")
+            filename = '{}.image{}.png'.format(
+                self.basename, next(self._image_counter))
             _log.info('Writing image file for inclusion: %s', filename)
             _png.write_png(im, filename)
             oid = oid or 'Im_' + self._make_id('image', filename)
