change call signature of colorizer._ensure_multivariate_data()

trygvrad · trygvrad · commit dc6dee72b5db · 2025-03-09T16:32:31.000+01:00
changed from  colorizer._ensure_multivariate_data(n_input, A)
to  colorizer._ensure_multivariate_data(A, n_input)
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6195,8 +6195,8 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
             # If provided, _pcolorargs will check that X, Y and C have the same shape.
             # Before this check, we need to convert C from shape (K, N, M), where K is
             # the number of variates, to (N, M) with a data type with K fields.
-            data = mcolorizer._ensure_multivariate_data(colorizer_obj.norm.n_input,
-                                                        args[-1])
+            data = mcolorizer._ensure_multivariate_data(args[-1],
+                                                        colorizer_obj.norm.n_input)
             args = (*args[:-1], data)
 
         X, Y, C, shading = self._pcolorargs('pcolor', *args, shading=shading,
@@ -6474,8 +6474,8 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
             # If provided, _pcolorargs will check that X, Y and C have the same shape.
             # Before this check, we need to convert C from shape (K, N, M), where K is
             # the number of variates, to (N, M) with a data type with K fields.
-            data = mcolorizer._ensure_multivariate_data(colorizer_obj.norm.n_input,
-                                                        args[-1])
+            data = mcolorizer._ensure_multivariate_data(args[-1],
+                                                        colorizer_obj.norm.n_input)
             args = (*args[:-1], data)
 
         X, Y, C, shading = self._pcolorargs('pcolormesh', *args,
diff --git a/lib/matplotlib/colorizer.py b/lib/matplotlib/colorizer.py
@@ -582,7 +582,7 @@ def set_array(self, A):
             self._A = None
             return
 
-        A = _ensure_multivariate_data(self.norm.n_input, A)
+        A = _ensure_multivariate_data(A, self.norm.n_input)
 
         A = cbook.safe_masked_invalid(A, copy=True)
         if not np.can_cast(A.dtype, float, "same_kind"):
@@ -862,7 +862,7 @@ def _ensure_cmap(cmap, accept_multivariate=False):
     return cm.colormaps[cmap_name]
 
 
-def _ensure_multivariate_data(n_input, data):
+def _ensure_multivariate_data(data, n_input):
     """
     Ensure that the data has dtype with n_input.
     Input data of shape (n_input, n, m) is converted to an array of shape
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -643,7 +643,7 @@ def _normalize_image_array(A, n_input=1):
         Check validity of image-like input *A* and normalize it to a format suitable for
         Image subclasses.
         """
-        A = mcolorizer._ensure_multivariate_data(n_input, A)
+        A = mcolorizer._ensure_multivariate_data(A, n_input)
         A = cbook.safe_masked_invalid(A, copy=True)
         if n_input == 1:
             if A.dtype != np.uint8 and not np.can_cast(A.dtype, float, "same_kind"):
