Commit83f82f2

committed

Save a couple of numpy conversions.

1 parentc212f2f commit83f82f2Copy full SHA for 83f82f2

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -500,9 +500,8 @@ def print_png(self, filename_or_obj, *args,`
`500`	`500`	`"""`
`501`	`501`	`FigureCanvasAgg.draw(self)`
`502`	`502`	`mpl.image.imsave(`
`503`		`-filename_or_obj,np.asarray(self.buffer_rgba()),format="png",`
`504`		`-origin="upper",dpi=self.figure.dpi,`
`505`		`-metadata=metadata,pil_kwargs=pil_kwargs)`
	`503`	`+filename_or_obj,self.buffer_rgba(),format="png",origin="upper",`
	`504`	`+dpi=self.figure.dpi,metadata=metadata,pil_kwargs=pil_kwargs)`
`506`	`505`
`507`	`506`	`defprint_to_buffer(self):`
`508`	`507`	`FigureCanvasAgg.draw(self)`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1514,7 +1514,15 @@ def imsave(fname, arr, vmin=None, vmax=None, cmap=None, format=None,`
`1514`	`1514`	`origin=mpl.rcParams["image.origin"]`
`1515`	`1515`	`iforigin=="lower":`
`1516`	`1516`	`arr=arr[::-1]`
`1517`		`-rgba=sm.to_rgba(arr,bytes=True)`
	`1517`	`+if (isinstance(arr,memoryview)andarr.format=="B"`
	`1518`	`+andarr.ndim==3andarr.shape[-1]==4):`
	`1519`	+# Such an ``arr`` would also be handled fine by sm.to_rgba (after
	`1520`	`+# casting with asarray), but it is useful to special-case it`
	`1521`	`+# because that's what backend_agg passes, and can be in fact used`
	`1522`	`+# as is, saving a few operations.`
	`1523`	`+rgba=arr`
	`1524`	`+else:`
	`1525`	`+rgba=sm.to_rgba(arr,bytes=True)`
`1518`	`1526`	`ifpil_kwargsisNone:`
`1519`	`1527`	`pil_kwargs= {}`
`1520`	`1528`	`pil_shape= (rgba.shape[1],rgba.shape[0])`

Comments

(0)