Merge pull request #7 from anovik/charcodeToGID_fix

gunnsth · web-flow · commit 6cd6cb023cd2 · 2023-11-26T10:08:41.000Z
[US-196] Fix for charcodeToGid check.
diff --git a/truetype/truetype.go b/truetype/truetype.go
@@ -497,7 +497,8 @@ func (f *Font) Index(x rune) Index {
 		return Index(val)
 	}
 
-	if len(f.charcodeToGID) > int(c) {
+	if len(f.charcodeToGID) > 0 && c < 256 {
+		// charcodeToGID is not empty and c is in 0..255 uint8 range
 		val := f.charcodeToGID[uint8(c)]
 		return Index(val)
 	}

Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,8 @@ func (f *Font) Index(x rune) Index {`
`497`	`497`	`return Index(val)`
`498`	`498`	`}`
`499`	`499`
`500`		`- if len(f.charcodeToGID) > int(c) {`
	`500`	`+ if len(f.charcodeToGID) > 0 && c < 256 {`
	`501`	`+ // charcodeToGID is not empty and c is in 0..255 uint8 range`
`501`	`502`	`val := f.charcodeToGID[uint8(c)]`
`502`	`503`	`return Index(val)`
`503`	`504`	`}`