From 453050ba07845ed3cb4257a431c89689bbf1b763 Mon Sep 17 00:00:00 2001
From: Sebastien Binet <binet@cern.ch>
Date: Mon, 3 Apr 2023 10:15:35 +0200
Subject: [PATCH] pdf: use a stable method to devise an ImageInfoType ID

Signed-off-by: Sebastien Binet <binet@cern.ch>
---
 def.go | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/def.go b/def.go
index 1d523a6..3c6156b 100644
--- a/def.go
+++ b/def.go
@@ -19,10 +19,12 @@ package fpdf
 import (
 	"bytes"
 	"crypto/sha1"
+	"encoding/binary"
 	"encoding/gob"
 	"encoding/json"
 	"fmt"
 	"io"
+	"math"
 	"time"
 )
 
@@ -180,9 +182,70 @@ type ImageInfoType struct {
 	i     string  // SHA-1 checksum of the above values.
 }
 
+type idEncoder struct {
+	w   io.Writer
+	buf []byte
+	err error
+}
+
+func newIDEncoder(w io.Writer) *idEncoder {
+	return &idEncoder{
+		w:   w,
+		buf: make([]byte, 8),
+	}
+}
+
+func (enc *idEncoder) i64(v int64) {
+	if enc.err != nil {
+		return
+	}
+	binary.LittleEndian.PutUint64(enc.buf, uint64(v))
+	_, enc.err = enc.w.Write(enc.buf)
+}
+
+func (enc *idEncoder) f64(v float64) {
+	if enc.err != nil {
+		return
+	}
+	binary.LittleEndian.PutUint64(enc.buf, math.Float64bits(v))
+	_, enc.err = enc.w.Write(enc.buf)
+}
+
+func (enc *idEncoder) str(v string) {
+	if enc.err != nil {
+		return
+	}
+	_, enc.err = enc.w.Write([]byte(v))
+}
+
+func (enc *idEncoder) bytes(v []byte) {
+	if enc.err != nil {
+		return
+	}
+	_, enc.err = enc.w.Write(v)
+}
+
 func generateImageID(info *ImageInfoType) (string, error) {
-	b, err := info.GobEncode()
-	return fmt.Sprintf("%x", sha1.Sum(b)), err
+	sha := sha1.New()
+	enc := newIDEncoder(sha)
+	enc.bytes(info.data)
+	enc.bytes(info.smask)
+	enc.i64(int64(info.n))
+	enc.f64(info.w)
+	enc.f64(info.h)
+	enc.str(info.cs)
+	enc.bytes(info.pal)
+	enc.i64(int64(info.bpc))
+	enc.str(info.f)
+	enc.str(info.dp)
+	for _, v := range info.trns {
+		enc.i64(int64(v))
+	}
+	enc.f64(info.scale)
+	enc.f64(info.dpi)
+	enc.str(info.i)
+
+	return fmt.Sprintf("%x", sha.Sum(nil)), nil
 }
 
 // GobEncode encodes the receiving image to a byte slice.