From bcb9f98f8be46b7aee5aeaa197ee5a883e20c0a4 Mon Sep 17 00:00:00 2001 From: xiaoqidun Date: Tue, 6 Oct 2026 00:04:26 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=90=E9=9B=86=E5=AD=97=E4=BD=93=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ofdgo_renderer_font_loader_canvas.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ofdgo_renderer_font_loader_canvas.go b/ofdgo_renderer_font_loader_canvas.go index 7cce56e..4940459 100644 --- a/ofdgo_renderer_font_loader_canvas.go +++ b/ofdgo_renderer_font_loader_canvas.go @@ -14,9 +14,13 @@ package ofdgo -import "github.com/tdewolff/canvas" +import ( + "fmt" -// loadFont 加载字体 + "github.com/tdewolff/canvas" +) + +// loadFont 加载字体,绘图别名按数据和样式隔离,不改动原始字体名称 // 入参: fontID 字体ID // 返回: *canvas.FontFamily 字体族 func (r *Renderer) loadFont(fontID string) *canvas.FontFamily { @@ -46,7 +50,7 @@ func (r *Renderer) loadFont(fontID string) *canvas.FontFamily { r.canvasState().fontMap[fontID] = ff return ff } - ff := canvas.NewFontFamily(of.FontName) + ff := canvas.NewFontFamily(fmt.Sprintf("ofdgo-%x-%d", resolved.digest, fontStyle)) if err := ff.LoadFont(fontData, 0, fontStyle); err != nil { r.renderError = err return nil