Commit3307a92

committed

SimplifyColormap.__call__ a bit.

- lut is never modified anymore, so we don't need to copy it.- Preallocating rgba doesn't help.- We can rely on np.clip to cast alpha to an array.

1 parent69931a6 commit3307a92Copy full SHA for 3307a92

File tree

-12

lines changed

-12

lines changed

Lines changed: 8 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -633,24 +633,20 @@ def __call__(self, X, alpha=None, bytes=False):`
`633`	`633`	`xa[xa<0]=self._i_under`
`634`	`634`	`xa[mask_bad]=self._i_bad`
`635`	`635`
	`636`	`+lut=self._lut`
`636`	`637`	`ifbytes:`
`637`		`-lut= (self._lut*255).astype(np.uint8)`
`638`		`-else:`
`639`		`-lut=self._lut.copy()# Don't let alpha modify original _lut.`
	`638`	`+lut= (lut*255).astype(np.uint8)`
`640`	`639`
`641`		`-rgba=np.empty(shape=xa.shape+ (4,),dtype=lut.dtype)`
`642`		`-lut.take(xa,axis=0,mode='clip',out=rgba)`
	`640`	`+rgba=lut.take(xa,axis=0,mode='clip')`
`643`	`641`
`644`	`642`	`ifalphaisnotNone:`
`645`		`-ifnp.iterable(alpha):`
`646`		`-alpha=np.asarray(alpha)`
`647`		`-ifalpha.shape!=xa.shape:`
`648`		`-raiseValueError("alpha is array-like but its shape"`
`649`		`-" %s doesn't match that of X %s"%`
`650`		`- (alpha.shape,xa.shape))`
`651`	`643`	`alpha=np.clip(alpha,0,1)`
`652`	`644`	`ifbytes:`
`653`		`-alpha= (alpha*255).astype(np.uint8)`
	`645`	`+alpha*=255# Will be cast to uint8 upon assignment.`
	`646`	`+ifalpha.shapenotin [(),xa.shape]:`
	`647`	`+raiseValueError(`
	`648`	`+f"alpha is array-like but its shape{alpha.shape} does "`
	`649`	`+f"not match that of X{xa.shape}")`
`654`	`650`	`rgba[...,-1]=alpha`
`655`	`651`
`656`	`652`	`# If the "bad" color is all zeros, then ignore alpha input.`

Comments

(0)