Commitcd66f15

authored

Merge pull request#30815 from timhoffm/mnt-rgb_to_hsv_int

MNT: Fix handling of ints in rgb_to_hsv()

2 parents875379d +4544674 commitcd66f15Copy full SHA for cd66f15

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3631,11 +3631,10 @@ def rgb_to_hsv(arr):`
`3631`	`3631`	`f"shape{arr.shape} was found.")`
`3632`	`3632`
`3633`	`3633`	`in_shape=arr.shape`
`3634`		`-arr=np.array(`
`3635`		`-arr,copy=False,`
`3636`		`-dtype=np.promote_types(arr.dtype,np.float32),# Don't work on ints.`
`3637`		`-ndmin=2,# In case input was 1D.`
`3638`		`- )`
	`3634`	`+# ensure numerics are done at least on float32; ints are cast as well`
	`3635`	`+arr=np.asarray(arr,dtype=np.promote_types(arr.dtype,np.float32))`
	`3636`	`+ifarr.ndim==1:`
	`3637`	`+arr=np.expand_dims(arr,axis=0)# ensure arr is 2D`
`3639`	`3638`
`3640`	`3639`	`out=np.zeros_like(arr)`
`3641`	`3640`	`arr_max=arr.max(-1)`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -947,6 +947,11 @@ def test_rgb_hsv_round_trip():`
`947`	`947`	`tt,mcolors.rgb_to_hsv(mcolors.hsv_to_rgb(tt)))`
`948`	`948`
`949`	`949`
	`950`	`+deftest_rgb_to_hsv_int():`
	`951`	`+# Test that int rgb values (still range 0-1) are processed correctly.`
	`952`	`+assert_array_equal(mcolors.rgb_to_hsv((0,1,0)), (1/3,1,1))# green`
	`953`	`+`
	`954`	`+`
`950`	`955`	`deftest_autoscale_masked():`
`951`	`956`	`# Test for #2336. Previously fully masked data would trigger a ValueError.`
`952`	`957`	`data=np.ma.masked_all((12,20))`

Comments

(0)