Initialize derived template with parent images

pm-phild · Sep 4, 2019 · f9ddde9 · f9ddde9
1 parent f8eb4ab
commit f9ddde9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/template.go b/template.go
@@ -84,7 +84,18 @@ func (f *Fpdf) UseTemplateScaled(t Template, corner PointType, size SizeType) {
 	for _, tt := range t.Templates() {
 		f.templates[tt.ID()] = tt
 	}
+
+	// Create a list of existing image SHA-1 hashes.
+	existingImages := map[string]bool{}
+	for _, image := range f.images {
+		existingImages[image.i] = true
+	}
+
+	// Add each template image to $f, unless already present.
 	for name, ti := range t.Images() {
+		if _, found := existingImages[ti.i]; found {
+			continue
+		}
 		name = sprintf("t%s-%s", t.ID(), name)
 		f.images[name] = ti
 	}

diff --git a/template_impl.go b/template_impl.go
@@ -296,4 +296,8 @@ func (t *Tpl) loadParamsFromFpdf(f *Fpdf) {
 	t.Fpdf.fontSizePt = f.fontSizePt
 	t.Fpdf.fontStyle = f.fontStyle
 	t.Fpdf.ws = f.ws
+
+	for key, value := range f.images {
+		t.Fpdf.images[key] = value
+	}
 }