Avoid pointer receiver and don't call PDFString of lazy objects internally.

fancycode · hhrutter · commit ca6d15e2a344 · 2024-04-24T11:39:26.000+02:00
diff --git a/pkg/pdfcpu/model/dereference.go b/pkg/pdfcpu/model/dereference.go
@@ -76,7 +76,7 @@ func (xRefTable *XRefTable) indRefToObject(ir *types.IndirectRef, decodeLazy boo
 
 	xRefTable.CurObj = int(ir.ObjectNumber)
 
-	if l, ok := entry.Object.(*types.LazyObjectStreamObject); ok && decodeLazy {
+	if l, ok := entry.Object.(types.LazyObjectStreamObject); ok && decodeLazy {
 		ob, err := l.DecodedObject(context.TODO())
 		if err != nil {
 			return nil, err
diff --git a/pkg/pdfcpu/read.go b/pkg/pdfcpu/read.go
@@ -2134,7 +2134,7 @@ func dereferencedObject(c context.Context, ctx *model.Context, objNr int) (types
 		}
 
 		entry.Object = o
-	} else if l, ok := entry.Object.(*types.LazyObjectStreamObject); ok {
+	} else if l, ok := entry.Object.(types.LazyObjectStreamObject); ok {
 		o, err := l.DecodedObject(c)
 		if err != nil {
 			return nil, errors.Wrapf(err, "dereferencedObject: problem dereferencing object %d", objNr)
diff --git a/pkg/pdfcpu/types/streamdict.go b/pkg/pdfcpu/types/streamdict.go
@@ -116,7 +116,7 @@ type LazyObjectStreamObject struct {
 }
 
 func NewLazyObjectStreamObject(osd *ObjectStreamDict, startOffset, endOffset int, decodeFunc DecodeLazyObjectStreamObjectFunc) Object {
-	return &LazyObjectStreamObject{
+	return LazyObjectStreamObject{
 		osd:         osd,
 		startOffset: startOffset,
 		endOffset:   endOffset,
@@ -125,8 +125,8 @@ func NewLazyObjectStreamObject(osd *ObjectStreamDict, startOffset, endOffset int
 	}
 }
 
-func (l *LazyObjectStreamObject) Clone() Object {
-	return &LazyObjectStreamObject{
+func (l LazyObjectStreamObject) Clone() Object {
+	return LazyObjectStreamObject{
 		osd:         l.osd,
 		startOffset: l.startOffset,
 		endOffset:   l.endOffset,
@@ -137,20 +137,20 @@ func (l *LazyObjectStreamObject) Clone() Object {
 	}
 }
 
-func (l *LazyObjectStreamObject) PDFString() string {
-	data, err := l.getData()
+func (l LazyObjectStreamObject) PDFString() string {
+	data, err := l.GetData()
 	if err != nil {
 		panic(err)
 	}
 
 	return string(data)
 }
 
-func (l *LazyObjectStreamObject) String() string {
+func (l LazyObjectStreamObject) String() string {
 	return l.PDFString()
 }
 
-func (l *LazyObjectStreamObject) getData() ([]byte, error) {
+func (l *LazyObjectStreamObject) GetData() ([]byte, error) {
 	if err := l.osd.Decode(); err != nil {
 		return nil, err
 	}
@@ -166,7 +166,7 @@ func (l *LazyObjectStreamObject) getData() ([]byte, error) {
 
 func (l *LazyObjectStreamObject) DecodedObject(c context.Context) (Object, error) {
 	if l.decodedObject == nil && l.decodedError == nil {
-		data, err := l.getData()
+		data, err := l.GetData()
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/pdfcpu/writeObjects.go b/pkg/pdfcpu/writeObjects.go
@@ -643,6 +643,15 @@ func writeDeepArray(ctx *model.Context, a types.Array, objNr, genNr int) error {
 	return nil
 }
 
+func writeLazyObjectStreamObject(ctx *model.Context, objNr, genNr int, o types.LazyObjectStreamObject) error {
+	data, err := o.GetData()
+	if err != nil {
+		return err
+	}
+
+	return writeObject(ctx, objNr, genNr, string(data))
+}
+
 func writeObjectGeneric(ctx *model.Context, o types.Object, objNr, genNr int) (err error) {
 	switch o := o.(type) {
 
@@ -673,8 +682,8 @@ func writeObjectGeneric(ctx *model.Context, o types.Object, objNr, genNr int) (e
 	case types.Name:
 		err = writeNameObject(ctx, objNr, genNr, o)
 
-	case *types.LazyObjectStreamObject:
-		err = writeObject(ctx, objNr, genNr, o.PDFString())
+	case types.LazyObjectStreamObject:
+		err = writeLazyObjectStreamObject(ctx, objNr, genNr, o)
 
 	default:
 		err = errors.Errorf("writeIndirectObject: undefined PDF object #%d %T\n", objNr, o)

Original file line number	Diff line number	Diff line change
`@@ -2134,7 +2134,7 @@ func dereferencedObject(c context.Context, ctx *model.Context, objNr int) (types`
`2134`	`2134`	`}`
`2135`	`2135`
`2136`	`2136`	`entry.Object = o`
`2137`		`- } else if l, ok := entry.Object.(*types.LazyObjectStreamObject); ok {`
	`2137`	`+ } else if l, ok := entry.Object.(types.LazyObjectStreamObject); ok {`
`2138`	`2138`	`o, err := l.DecodedObject(c)`
`2139`	`2139`	`if err != nil {`
`2140`	`2140`	`return nil, errors.Wrapf(err, "dereferencedObject: problem dereferencing object %d", objNr)`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ type LazyObjectStreamObject struct {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`func NewLazyObjectStreamObject(osd *ObjectStreamDict, startOffset, endOffset int, decodeFunc DecodeLazyObjectStreamObjectFunc) Object {`
`119`		`- return &LazyObjectStreamObject{`
	`119`	`+ return LazyObjectStreamObject{`
`120`	`120`	`osd: osd,`
`121`	`121`	`startOffset: startOffset,`
`122`	`122`	`endOffset: endOffset,`
`@@ -125,8 +125,8 @@ func NewLazyObjectStreamObject(osd *ObjectStreamDict, startOffset, endOffset int`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`-func (l *LazyObjectStreamObject) Clone() Object {`
`129`		`- return &LazyObjectStreamObject{`
	`128`	`+func (l LazyObjectStreamObject) Clone() Object {`
	`129`	`+ return LazyObjectStreamObject{`
`130`	`130`	`osd: l.osd,`
`131`	`131`	`startOffset: l.startOffset,`
`132`	`132`	`endOffset: l.endOffset,`
`@@ -137,20 +137,20 @@ func (l *LazyObjectStreamObject) Clone() Object {`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`-func (l *LazyObjectStreamObject) PDFString() string {`
`141`		`- data, err := l.getData()`
	`140`	`+func (l LazyObjectStreamObject) PDFString() string {`
	`141`	`+ data, err := l.GetData()`
`142`	`142`	`if err != nil {`
`143`	`143`	`panic(err)`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`return string(data)`
`147`	`147`	`}`
`148`	`148`
`149`		`-func (l *LazyObjectStreamObject) String() string {`
	`149`	`+func (l LazyObjectStreamObject) String() string {`
`150`	`150`	`return l.PDFString()`
`151`	`151`	`}`
`152`	`152`
`153`		`-func (l *LazyObjectStreamObject) getData() ([]byte, error) {`
	`153`	`+func (l *LazyObjectStreamObject) GetData() ([]byte, error) {`
`154`	`154`	`if err := l.osd.Decode(); err != nil {`
`155`	`155`	`return nil, err`
`156`	`156`	`}`
`@@ -166,7 +166,7 @@ func (l *LazyObjectStreamObject) getData() ([]byte, error) {`
`166`	`166`
`167`	`167`	`func (l *LazyObjectStreamObject) DecodedObject(c context.Context) (Object, error) {`
`168`	`168`	`if l.decodedObject == nil && l.decodedError == nil {`
`169`		`- data, err := l.getData()`
	`169`	`+ data, err := l.GetData()`
`170`	`170`	`if err != nil {`
`171`	`171`	`return nil, err`
`172`	`172`	`}`