Commit7fc99b5

committed

change call signature of colorizer._ensure_multivariate_data()

changed from colorizer._ensure_multivariate_data(n_input, A)to colorizer._ensure_multivariate_data(A, n_input)

1 parentd7a64a4 commit7fc99b5Copy full SHA for 7fc99b5

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6276,8 +6276,8 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,`
`6276`	`6276`	`# If provided, _pcolorargs will check that X, Y and C have the same shape.`
`6277`	`6277`	`# Before this check, we need to convert C from shape (K, N, M), where K is`
`6278`	`6278`	`# the number of variates, to (N, M) with a data type with K fields.`
`6279`		`-data=mcolorizer._ensure_multivariate_data(colorizer_obj.norm.n_input,`
`6280`		`-args[-1])`
	`6279`	`+data=mcolorizer._ensure_multivariate_data(args[-1],`
	`6280`	`+colorizer_obj.norm.n_input)`
`6281`	`6281`	`args= (*args[:-1],data)`
`6282`	`6282`
`6283`	`6283`	`X,Y,C,shading=self._pcolorargs('pcolor',*args,shading=shading,`
`@@ -6555,8 +6555,8 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,`
`6555`	`6555`	`# If provided, _pcolorargs will check that X, Y and C have the same shape.`
`6556`	`6556`	`# Before this check, we need to convert C from shape (K, N, M), where K is`
`6557`	`6557`	`# the number of variates, to (N, M) with a data type with K fields.`
`6558`		`-data=mcolorizer._ensure_multivariate_data(colorizer_obj.norm.n_input,`
`6559`		`-args[-1])`
	`6558`	`+data=mcolorizer._ensure_multivariate_data(args[-1],`
	`6559`	`+colorizer_obj.norm.n_input)`
`6560`	`6560`	`args= (*args[:-1],data)`
`6561`	`6561`
`6562`	`6562`	`X,Y,C,shading=self._pcolorargs('pcolormesh',*args,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ def set_array(self, A):`
`569`	`569`	`self._A=None`
`570`	`570`	`return`
`571`	`571`
`572`		`-A=_ensure_multivariate_data(self.norm.n_input,A)`
	`572`	`+A=_ensure_multivariate_data(A,self.norm.n_input)`
`573`	`573`
`574`	`574`	`A=cbook.safe_masked_invalid(A,copy=True)`
`575`	`575`	`ifnotnp.can_cast(A.dtype,float,"same_kind"):`
`@@ -849,7 +849,7 @@ def _ensure_cmap(cmap, accept_multivariate=False):`
`849`	`849`	`returncm.colormaps[cmap_name]`
`850`	`850`
`851`	`851`
`852`		`-def_ensure_multivariate_data(n_input,data):`
	`852`	`+def_ensure_multivariate_data(data,n_input):`
`853`	`853`	`"""`
`854`	`854`	`Ensure that the data has dtype with n_input.`
`855`	`855`	`Input data of shape (n_input, n, m) is converted to an array of shape`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ def _normalize_image_array(A, n_input=1):`
`643`	`643`	`Check validity of image-like input A and normalize it to a format suitable for`
`644`	`644`	`Image subclasses.`
`645`	`645`	`"""`
`646`		`-A=mcolorizer._ensure_multivariate_data(n_input,A)`
	`646`	`+A=mcolorizer._ensure_multivariate_data(A,n_input)`
`647`	`647`	`A=cbook.safe_masked_invalid(A,copy=True)`
`648`	`648`	`ifn_input==1:`
`649`	`649`	`ifA.dtype!=np.uint8andnotnp.can_cast(A.dtype,float,"same_kind"):`

Comments

(0)