Post go fix

Author: jphsd

color/hsl.go

@@ -131,7 +131,7 @@ func Monochrome(col Color, n int) []HSL {
 	res := make([]HSL, n)
 	dl := 1.0 / float64(n-1)
 	l := dl
-	for i := 0; i < n; i++ {
+	for i := range n {
 		hsl := NewHSL(col)
 		hsl.L = l
 		res[i] = hsl

image/color.go

@@ -25,10 +25,7 @@ type cstop struct {
 func NewColorizer(img Image, c1, c2 color.Color, stops []int, colors []color.Color, post bool) *Colorizer {
 	lut := make([]color.RGBA, 256)
 
-	sc := len(colors)
-	if sc > 254 {
-		sc = 254
-	}
+	sc := min(len(colors), 254)
 	if stops != nil && len(stops) < sc {
 		sc = len(stops)
 	}
@@ -62,7 +59,7 @@ func NewColorizer(img Image, c1, c2 color.Color, stops []int, colors []color.Col
 	// Build lut - simple lerp between c1, stops and c2, unless post set
 	if post {
 		ci := 0
-		for i := 0; i < 256; i++ {
+		for i := range 256 {
 			lut[i] = csl[ci].c
 			if i != 255 && i+1 == csl[ci+1].s {
 				ci++
@@ -71,7 +68,7 @@ func NewColorizer(img Image, c1, c2 color.Color, stops []int, colors []color.Col
 	} else {
 		ci := 0
 		ls := 0
-		for i := 0; i < 256; i++ {
+		for i := range 256 {
 			if i == csl[ci].s {
 				lut[i] = csl[ci].c
 				if i != 255 {

image/patch.go

@@ -19,12 +19,12 @@ func NewPatch(colors [][]color.Color) (*Patch, error) {
 	h := len(colors)
 	w := len(colors[0])
 	rgba := make([][]color.RGBA, h)
-	for i := 0; i < h; i++ {
+	for i := range h {
 		if len(colors[i]) != w {
 			return nil, fmt.Errorf("row %d has different length %d vs %d", i, len(colors[i]), w)
 		}
 		rgba[i] = make([]color.RGBA, w)
-		for j := 0; j < w; j++ {
+		for j := range w {
 			rgba[i][j], _ = color.RGBAModel.Convert(colors[i][j]).(color.RGBA)
 		}
 	}

path.go

@@ -187,14 +187,14 @@ type Part [][]float64
 
 // String converts a part into a string.
 func (p Part) String() string {
-	res := ""
+	var res strings.Builder
 	for i, pt := range p {
 		if i != 0 {
-			res += " "
+			res.WriteString(" ")
 		}
-		res += fmt.Sprintf("%.2f,%.2f", pt[0], pt[1])
+		res.WriteString(fmt.Sprintf("%.2f,%.2f", pt[0], pt[1]))
 	}
-	return res
+	return res.String()
 }
 
 // AddParts adds parts to the path and returns it.
@@ -890,18 +890,19 @@ func (p *Path) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 // P %f,%f[ %d[ %f,%f]][ C]
 func (p *Path) MarshalText() ([]byte, error) {
 	step := p.steps[0]
-	str := fmt.Sprintf("P %f,%f", step[0][0], step[0][1])
+	var str strings.Builder
+	str.WriteString(fmt.Sprintf("P %f,%f", step[0][0], step[0][1]))
 	for i := 1; i < len(p.steps); i++ {
 		step = p.steps[i]
-		str += fmt.Sprintf(" %d", len(step))
+		str.WriteString(fmt.Sprintf(" %d", len(step)))
 		for _, pts := range step {
-			str += fmt.Sprintf(" %f,%f", pts[0], pts[1])
+			str.WriteString(fmt.Sprintf(" %f,%f", pts[0], pts[1]))
 		}
 	}
 	if p.closed {
-		str += " C"
+		str.WriteString(" C")
 	}
-	return []byte(str), nil
+	return []byte(str.String()), nil
 }
 
 // UnmarshalText implements the encoding.TextUnmarshaler interface.

shape.go

@@ -224,12 +224,13 @@ func (s *Shape) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 // MarshalText implements the encoding.TextMarshaler interface.
 // S[ P %f,%f[ %d[ %f,%f]][ C]]
 func (s *Shape) MarshalText() ([]byte, error) {
-	str := "S"
+	var str strings.Builder
+	str.WriteString("S")
 	for _, path := range s.paths {
-		str += " " + path.String()
+		str.WriteString(" " + path.String())
 	}
 
-	return []byte(str), nil
+	return []byte(str.String()), nil
 }
 
 // UnmarshalText implements the encoding.TextUnmarshaler interface.

svg/cmd/house.go

@@ -90,7 +90,7 @@ func main() {
 }
 
 func MakeHouse() *g2d.Renderable {
-	// Order is important - furthest from eye obejcts first
+	// Order is important - furthest from eye objects first
 	res := MakeChimney()
 	res.AddRenderable(MakeFirstFloor(), nil)
 	res.AddRenderable(MakeSecondFloor(), nil)

util/bcroots.go

@@ -2,6 +2,7 @@ package util
 
 import (
 	"fmt"
+	"maps"
 	"math"
 	"sort"
 )
@@ -115,9 +116,7 @@ func CalcExtremities(points [][]float64) []float64 {
 
 // Add map2 to map1
 func addMap(map1, map2 map[string]bool) {
-	for k, v := range map2 {
-		map1[k] = v
-	}
+	maps.Copy(map1, map2)
 }
 
 func calcRoots(f, df func(float64) float64, tmap map[string]bool) {
@@ -137,7 +136,7 @@ func calcRoots(f, df func(float64) float64, tmap map[string]bool) {
 func NRM(start float64, f, df func(float64) float64) (float64, error) {
 	t := start
 
-	for i := 0; i < 100; i++ {
+	for range 100 {
 		d := df(t)
 		if Equals(d, 0) {
 			return 0, fmt.Errorf("zero derivative at %f", t)

util/boundingbox.go

@@ -18,7 +18,7 @@ func BoundingBox(pts ...[]float64) [][]float64 {
 	res[0] = make([]float64, d)
 	res[1] = make([]float64, d)
 
-	for i := 0; i < d; i++ {
+	for i := range d {
 		res[0][i], res[1][i] = math.MaxFloat64, -math.MaxFloat64
 	}
 
@@ -42,7 +42,7 @@ func BoundingBox(pts ...[]float64) [][]float64 {
 // BBOverlap returns true if bb1 and bb2 overlap at the smallest dimensionality.
 func BBOverlap(bb1, bb2 [][]float64) bool {
 	md := min(len(bb1[0]), len(bb2[0]))
-	for i := 0; i < md; i++ {
+	for i := range md {
 		if bb1[0][i] > bb2[1][i] || bb2[0][i] > bb1[1][i] {
 			return false
 		}
@@ -54,7 +54,7 @@ func BBOverlap(bb1, bb2 [][]float64) bool {
 func BBIntersection(bb1, bb2 [][]float64) [][]float64 {
 	md := min(len(bb1[0]), len(bb2[0]))
 	res := [][]float64{make([]float64, md), make([]float64, md)}
-	for i := 0; i < md; i++ {
+	for i := range md {
 		if bb1[0][i] > bb2[1][i] || bb2[0][i] > bb1[1][i] {
 			return nil
 		}
@@ -68,7 +68,7 @@ func BBIntersection(bb1, bb2 [][]float64) [][]float64 {
 // BBContains returns true if p is in bb at the smallest dimensionality.
 func BBContains(p []float64, bb [][]float64) bool {
 	md := min(len(bb[0]), len(p))
-	for i := 0; i < md; i++ {
+	for i := range md {
 		if p[i] < bb[0][i] || p[i] > bb[1][i] {
 			return false
 		}

util/curves.go

@@ -92,7 +92,7 @@ func DeCasteljau(pts [][]float64, t float64) []float64 {
 	}
 	npts := make([][]float64, len(pts)-1)
 	omt := 1 - t
-	for i := 0; i < len(npts); i++ {
+	for i := range npts {
 		npts[i] = []float64{
 			omt*pts[i][0] + t*pts[i+1][0], omt*pts[i][1] + t*pts[i+1][1],
 			pts[i+1][0] - pts[i][0], pts[i+1][1] - pts[i][1]}

util/math.go

@@ -201,7 +201,7 @@ func Centroid(pts ...[]float64) []float64 {
 		}
 	}
 	// Scale
-	for i := 0; i < d; i++ {
+	for i := range d {
 		res[i] /= float64(n)
 	}
 	return res