From 26651ce252ee3b803e1ce3273017c9fb4a6562fa Mon Sep 17 00:00:00 2001
From: Yonah <contrib@gensokyo.uk>
Date: Sun, 13 Jul 2025 02:08:38 +0900
Subject: [PATCH] line: do not allocate new uniform

---
 caption_test.go | 16 ++++++++--------
 line.go         |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/caption_test.go b/caption_test.go
index ea16924..8387185 100644
--- a/caption_test.go
+++ b/caption_test.go
@@ -32,6 +32,7 @@ func TestRender(t *testing.T) {
 			0, 0, "", truetype.FormatError("TTF data is too short")},
 		{"bad fast path font", &caption.Line{}, caption.NewContext([]byte{0xfd}, nil),
 			0, 0, "", truetype.FormatError("TTF data is too short")},
+
 		{"custom line options", &caption.Line{
 			Data:    []caption.Segment{{"Beispieltext", color.Black}},
 			Options: &truetype.Options{Size: 24},
@@ -77,18 +78,17 @@ func TestRender(t *testing.T) {
 		redraw:
 			got := image.NewRGBA64(image.Rectangle{Max: image.Point{X: 1 << 10, Y: 1 << 9}})
 			err := tc.line.Render(ctx, got, tc.x, tc.y)
-			if err != nil {
-				if !errors.Is(err, tc.wantErr) {
-					t.Errorf("Render: error = %q, want %q",
-						err, tc.wantErr)
-				}
-				return
-			}
-
 			for _, f := range beforeCheck {
 				f(t, tc.name, redraw == "", got)
 			}
 
+			if !errors.Is(err, tc.wantErr) {
+				t.Fatalf("Render: error = %q, want %q", err, tc.wantErr)
+			}
+			if err != nil {
+				return
+			}
+
 			t.Run("hash"+redraw, func(t *testing.T) {
 				var wantDigest []byte
 				if wantDigest, err = hex.DecodeString(tc.want); err != nil {
diff --git a/line.go b/line.go
index e19ec61..fb9230b 100644
--- a/line.go
+++ b/line.go
@@ -59,9 +59,9 @@ func (l *Line) Render(ctx *Context, frame draw.Image, x, y int) error {
 		face = ctx.defaultFont
 	}
 
-	drawer := &font.Drawer{Dst: frame, Face: face, Dot: fixed.Point26_6{X: fixed.I(x), Y: fixed.I(y)}}
+	drawer := &font.Drawer{Dst: frame, Src: new(image.Uniform), Face: face, Dot: fixed.Point26_6{X: fixed.I(x), Y: fixed.I(y)}}
 	for _, seg := range l.Data {
-		drawer.Src = image.NewUniform(seg.Color)
+		drawer.Src.(*image.Uniform).C = seg.Color
 		drawer.DrawString(seg.Value)
 	}