Remove NextPowerOf2 (for uint64)

internal/math.go

@@ -19,21 +19,16 @@ import (
 	"math"
 )
 
-func NextPowerOf2(x uint64) uint64 {
+func NextPowerOf2Int(x int) int {
 	x -= 1
 	x |= (x >> 1)
 	x |= (x >> 2)
 	x |= (x >> 4)
 	x |= (x >> 8)
 	x |= (x >> 16)
-	x |= (x >> 32)
 	return x + 1
 }
 
-func NextPowerOf2Int(size int) int {
-	return int(NextPowerOf2(uint64(size)))
-}
-
 func RGBA(clr color.Color) (r, g, b, a float64) {
 	cr, cg, cb, ca := clr.RGBA()
 	const max = math.MaxUint16

internal/math_test.go

@@ -21,8 +21,8 @@ import (
 
 func TestNextPowerOf2(t *testing.T) {
 	testCases := []struct {
-		expected uint64
-		arg      uint64
+		expected int
+		arg      int
 	}{
 		{256, 255},
 		{256, 256},
@@ -30,7 +30,7 @@ func TestNextPowerOf2(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		got := NextPowerOf2(testCase.arg)
+		got := NextPowerOf2Int(testCase.arg)
 		wanted := testCase.expected
 		if wanted != got {
 			t.Errorf("Clp(%d) = %d, wanted %d", testCase.arg, got, wanted)