Tweaks

Author: tdewolff

helpers_test.go

@@ -0,0 +1,27 @@
+package canvas
+
+import "math/rand/v2"
+
+func RandomPath(n int, closed bool) *Path {
+	p := &Path{}
+	if 0 < n {
+		p.d = append(p.d, MoveToCmd, rand.NormFloat64(), rand.NormFloat64(), MoveToCmd)
+		for i := 1; i < n; i++ {
+			switch rand.IntN(4) {
+			case 0:
+				p.d = append(p.d, LineToCmd, rand.NormFloat64(), rand.NormFloat64(), LineToCmd)
+			case 1:
+				p.d = append(p.d, QuadToCmd, rand.NormFloat64(), rand.NormFloat64(), rand.NormFloat64(), rand.NormFloat64(), QuadToCmd)
+			case 2:
+				p.d = append(p.d, CubeToCmd, rand.NormFloat64(), rand.NormFloat64(), rand.NormFloat64(), rand.NormFloat64(), rand.NormFloat64(), rand.NormFloat64(), CubeToCmd)
+			case 3:
+				large, sweep := rand.IntN(2) == 0, rand.IntN(2) == 0
+				p.d = append(p.d, ArcToCmd, rand.NormFloat64(), rand.NormFloat64(), rand.NormFloat64(), fromArcFlags(large, sweep), rand.NormFloat64(), rand.NormFloat64(), ArcToCmd)
+			}
+		}
+		if closed {
+			p.d = append(p.d, CloseCmd, p.d[1], p.d[2], CloseCmd)
+		}
+	}
+	return p
+}

path_scanner_test.go

@@ -0,0 +1,23 @@
+package canvas
+
+import "testing"
+
+func BenchmarkScanner(b *testing.B) {
+	p := RandomPath(1000, true)
+	b.Run("Manual", func(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			for j := 0; j < len(p.d); {
+				j += cmdLen(p.d[j])
+				_, _ = p.d[j-3], p.d[j-2]
+			}
+		}
+	})
+
+	b.Run("Scanner", func(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			for s := p.Scanner(); s.Scan(); {
+				_ = s.End()
+			}
+		}
+	})
+}

renderers/pdf/writer.go

@@ -302,7 +302,7 @@ func standardFontName(font *canvas.Font) string {
 
 func (w *pdfWriter) getFont(font *canvas.Font, vertical bool) pdfRef {
 	if standardFont := standardFontName(font); standardFont != "" {
-		// handle 14 embedded standard fonts in PDF if name and style matches
+		// handle 14 embedded standard fonts in PDF if name and style match
 		if ref, ok := w.fontsStd[font]; ok {
 			return ref
 		}

util.go

@@ -405,6 +405,11 @@ func (r Rect) H() float64 {
 	return r.Y1 - r.Y0
 }
 
+// Area returns the area of the rectangle.
+func (r Rect) Area() float64 {
+	return (r.X1 - r.X0) * (r.Y1 - r.Y0)
+}
+
 // Center returns the center point.
 func (r Rect) Center() Point {
 	return Point{(r.X0 + r.X1) / 2.0, (r.Y0 + r.Y1) / 2.0}
@@ -592,11 +597,6 @@ func (r Rect) And(q Rect) Rect {
 
 }
 
-// Area returns the area of the rectangle.
-func (r Rect) Area() float64 {
-	return (r.X1 - r.X0) * (r.Y1 - r.Y0)
-}
-
 // ToPath converts the rectangle to a path.
 func (r Rect) ToPath() *Path {
 	return Rectangle(r.X1-r.X0, r.Y1-r.Y0).Translate(r.X0, r.Y0)