Commitf6340d4

committed

BUG: fix normalizing image data contained in np.ndarray subclass

1 parent09eab5b commitf6340d4Copy full SHA for f6340d4

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -461,12 +461,12 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,`
`461`	`461`	`vmid=np.float64(self.norm.vmin)+dv/2`
`462`	`462`	`fact=1e7ifscaled_dtype==np.float64else1e4`
`463`	`463`	`newmin=vmid-dv*fact`
`464`		`-ifnewmin<a_min:`
	`464`	`+ifnewmin<np.float64(a_min):`
`465`	`465`	`newmin=None`
`466`	`466`	`else:`
`467`	`467`	`a_min=np.float64(newmin)`
`468`	`468`	`newmax=vmid+dv*fact`
`469`		`-ifnewmax>a_max:`
	`469`	`+ifnewmax>np.float64(a_max):`
`470`	`470`	`newmax=None`
`471`	`471`	`else:`
`472`	`472`	`a_max=np.float64(newmax)`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2853,15 +2853,15 @@ def nonsingular(vmin, vmax, expander=0.001, tiny=1e-15, increasing=True):`
`2853`	`2853`	`if (notnp.isfinite(vmin))or (notnp.isfinite(vmax)):`
`2854`	`2854`	`return-expander,expander`
`2855`	`2855`
	`2856`	`+# Expand vmin, vmax to float: if they were integer types, they can wrap`
	`2857`	`+# around in abs (abs(np.int8(-128)) == -128) and vmax - vmin can overflow.`
	`2858`	`+vmin,vmax=map(np.float64, (vmin,vmax))`
	`2859`	`+`
`2856`	`2860`	`swapped=False`
`2857`	`2861`	`ifvmax<vmin:`
`2858`	`2862`	`vmin,vmax=vmax,vmin`
`2859`	`2863`	`swapped=True`
`2860`	`2864`
`2861`		`-# Expand vmin, vmax to float: if they were integer types, they can wrap`
`2862`		`-# around in abs (abs(np.int8(-128)) == -128) and vmax - vmin can overflow.`
`2863`		`-vmin,vmax=map(float, [vmin,vmax])`
`2864`		`-`
`2865`	`2865`	`maxabsvalue=max(abs(vmin),abs(vmax))`
`2866`	`2866`	`ifmaxabsvalue< (1e6/tiny)*np.finfo(float).tiny:`
`2867`	`2867`	`vmin=-expander`

Comments

(0)