Merge pull request #14926 from anntzer/matrix_from_values

timhoffm · web-flow · commit 4d8959e90cf1 · 2019-08-05T11:59:12.000+01:00
Save a matrix unpacking/repacking in offsetbox.
diff --git a/doc/api/api_changes/2019-06-26-AL.rst b/doc/api/api_changes/2019-06-26-AL.rst
@@ -0,0 +1,5 @@
+Deprecations
+````````````
+
+``Affine2DBase.matrix_from_values(...)`` is deprecated.  Use (for example)
+``Affine2D.from_values(...).get_matrix()`` instead.
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -1031,22 +1031,17 @@ def get_window_extent(self, renderer):
         return mtransforms.Bbox.from_bounds(ox - xd, oy - yd, w, h)
 
     def get_extent(self, renderer):
-
         # clear the offset transforms
-        _off = self.offset_transform.to_values()  # to be restored later
+        _off = self.offset_transform.get_matrix()  # to be restored later
         self.ref_offset_transform.clear()
         self.offset_transform.clear()
-
         # calculate the extent
         bboxes = [c.get_window_extent(renderer) for c in self._children]
         ub = mtransforms.Bbox.union(bboxes)
-
         # adjust ref_offset_transform
         self.ref_offset_transform.translate(-ub.x0, -ub.y0)
-
         # restor offset transform
-        mtx = self.offset_transform.matrix_from_values(*_off)
-        self.offset_transform.set_matrix(mtx)
+        self.offset_transform.set_matrix(_off)
 
         return ub.width, ub.height, 0., 0.
 
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1755,6 +1755,8 @@ def to_values(self):
         return tuple(mtx[:2].swapaxes(0, 1).flat)
 
     @staticmethod
+    @cbook.deprecated(
+        "3.2", alternative="Affine2D.from_values(...).get_matrix()")
     def matrix_from_values(a, b, c, d, e, f):
         """
         Create a new transformation matrix as a 3x3 numpy array of the form::
