Conditionally order another map iteration. Fix 'go vet' problem with unkeyed field in composite literal.

1 files changed, 2 insertions, 13 deletions

diff --git a/fpdf.go b/fpdf.go
index 08bcb2e..74489de 100644
--- a/fpdf.go
+++ b/fpdf.go
@@ -3367,21 +3367,10 @@ func (f *Fpdf) putxobjectdict() {
 		}
 	}
 	{
-		var key int64
 		var keyList []int64
+		var key int64
 		var tpl Template
-		for key = range f.templates {
-			keyList = append(keyList, key)
-		}
-		if f.catalogSort {
-			gensort(len(keyList),
-				func(a, b int) bool {
-					return keyList[a] < keyList[b]
-				},
-				func(a, b int) {
-					keyList[a], keyList[b] = keyList[b], keyList[a]
-				})
-		}
+		keyList = templateKeyList(f.templates, f.catalogSort)
 		for _, key = range keyList {
 			tpl = f.templates[key]
 			// for _, tpl := range f.templates {