feat(图像解码): 升级JBIG2到v1.0.0

go.mod

@@ -5,7 +5,7 @@ go 1.26.0
 require (
 	github.com/tdewolff/canvas v0.0.0-20260901160717-dae8cd8e19a7
 	github.com/tdewolff/font v0.0.0-20260822205238-d0d2f004b117
-	github.com/xiaoqidun/jbig2 v0.0.0-20260912052037-9a7cadfca98c
+	github.com/xiaoqidun/jbig2 v1.0.0
 	golang.org/x/image v0.46.0
 	golang.org/x/text v0.42.0
 )

go.sum

@@ -71,8 +71,8 @@ github.com/tdewolff/test v1.0.12 h1:7F21DqIajswxuche0geHdrUZRCWE4oko4b7bcmkkrxk=
 github.com/tdewolff/test v1.0.12/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
 github.com/wcharczuk/go-chart/v2 v2.1.2 h1:Y17/oYNuXwZg6TFag06qe8sBajwwsuvPiJJXcUcLL6E=
 github.com/wcharczuk/go-chart/v2 v2.1.2/go.mod h1:Zi4hbaqlWpYajnXB2K22IUYVXRXaLfSGNNR7P4ukyyQ=
-github.com/xiaoqidun/jbig2 v0.0.0-20260912052037-9a7cadfca98c h1:ZnB6Js4yt9X3hcM3X+ddZUgHAD4VKoAO5EIwZxFET98=
+github.com/xiaoqidun/jbig2 v1.0.0 h1:Wt434JKS7j7LqHnMSL/3yatRCxjOfDiA+RhZA/DhAAo=
-github.com/xiaoqidun/jbig2 v0.0.0-20260912052037-9a7cadfca98c/go.mod h1:8QonVWtENmh2kc6l+leqeGl7psb79DWlHDkCpdChjfQ=
+github.com/xiaoqidun/jbig2 v1.0.0/go.mod h1:8QonVWtENmh2kc6l+leqeGl7psb79DWlHDkCpdChjfQ=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=

ofdgo_renderer_layer.go

@@ -25,8 +25,8 @@ func (r *Renderer) renderAnnotations(ctx *canvas.Context, pageID string, pageH f
 		}
 		box, _ := ParseBox(annot.Appearance.Boundary)
 		ctm := Matrix{a: 1, d: 1, e: box.X, f: box.Y}
-		for _, obj := range annot.Appearance.Objects {
+		for i := range annot.Appearance.Objects {
-			r.renderObject(ctx, obj, pageH, nil, &ctm, false, nil)
+			r.renderObject(ctx, &annot.Appearance.Objects[i], pageH, nil, &ctm, false, nil)
 		}
 	}
 }
@@ -92,8 +92,8 @@ func (r *Renderer) renderLayers(ctx *canvas.Context, layers []Layer, pageH float
 func (r *Renderer) renderLayer(ctx *canvas.Context, layer Layer, pageH float64, defaults *DrawParam, parentCTM *Matrix) {
 	defaults = r.drawParamDefaults(layer.DrawParam, defaults)
 	if len(layer.Objects) > 0 {
-		for _, obj := range layer.Objects {
+		for i := range layer.Objects {
-			r.renderObject(ctx, obj, pageH, defaults, parentCTM, false, nil)
+			r.renderObject(ctx, &layer.Objects[i], pageH, defaults, parentCTM, false, nil)
 		}
 		return
 	}
@@ -143,7 +143,7 @@ func (r *Renderer) renderCompositeGraphicUnit(ctx *canvas.Context, cgu Composite
 	if len(cgu.Objects) > 0 {
 		for _, obj := range cgu.Objects {
 			obj = mergeGraphicObjectAlpha(obj, cgu.Alpha)
-			r.renderObject(ctx, obj, pageH, defaults, &currentCTM, boundaryInCTM, clipPath)
+			r.renderObject(ctx, &obj, pageH, defaults, &currentCTM, boundaryInCTM, clipPath)
 		}
 		ctx.Pop()
 		return
@@ -169,7 +169,7 @@ func (r *Renderer) renderCompositeGraphicUnit(ctx *canvas.Context, cgu Composite
 
 // renderObject 渲染图形对象
 // 入参: ctx 画布上下文, obj 图形对象, pageH 页面高度, defaults 默认绘制参数, parentCTM 父级CTM, boundaryInCTM 边界是否参与CTM变换, parentClip 父级裁剪路径
-func (r *Renderer) renderObject(ctx *canvas.Context, obj GraphicObject, pageH float64, defaults *DrawParam, parentCTM *Matrix, boundaryInCTM bool, parentClip *canvas.Path) {
+func (r *Renderer) renderObject(ctx *canvas.Context, obj *GraphicObject, pageH float64, defaults *DrawParam, parentCTM *Matrix, boundaryInCTM bool, parentClip *canvas.Path) {
 	switch obj.Type {
 	case "TextObject":
 		r.renderText(ctx, obj.TextObject, pageH, defaults, parentCTM, boundaryInCTM, parentClip)

ofdgo_renderer_path.go

@@ -359,7 +359,7 @@ func (r *Renderer) renderPattern(ctx *canvas.Context, pattern *patternPaint, pag
 			}
 			for _, obj := range pattern.CellContent.Objects {
 				obj = mergeGraphicObjectAlpha(obj, pattern.alpha)
-				r.renderObject(ctx, obj, pageH, defaults, &tileCTM, true, clip)
+				r.renderObject(ctx, &obj, pageH, defaults, &tileCTM, true, clip)
 			}
 		}
 	}