crunchy-rocks/freetype
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

s/NameIDCode/NameID/g

Browse source
This commit is contained in:
Steven Edwards 2015-09-11 04:57:14 -04:00
parent 134884e1a5
commit 2cc98d1ad8
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
truetype/truetype.go
View file

@ -27,28 +27,28 @@ import (
type Index uint16
// A NameID represents the Name Identifiers in the name table.
type NameIDCode uint16
type NameID uint16
const (
NameIDCodeCopyright NameIDCode = 0
NameIDCodeFontFamily = 1
NameIDCodeFontSubfamily = 2
NameIDCodeUniqueSubfamilyID = 3
NameIDCodeFontFullName = 4
NameIDCodeNameTableVersion = 5
NameIDCodePostscriptName = 6
NameIDCodeTrademarkNotice = 7
NameIDCodeManufacturerName = 8
NameIDCodeDesignerName = 9
NameIDCodeFontDescription = 10
NameIDCodeFontVendorURL = 11
NameIDCodeFontDesignerURL = 12
NameIDCodeFontLicense = 13
NameIDCodeFontLicenseURL = 14
NameIDCodePreferredFamily = 16
NameIDCodePreferredSubfamily = 17
NameIDCodeCompatibleName = 18
NameIDCodeSampleText = 19
NameIDCopyright NameID = 0
NameIDFontFamily = 1
NameIDFontSubfamily = 2
NameIDUniqueSubfamilyID = 3
NameIDFontFullName = 4
NameIDNameTableVersion = 5
NameIDPostscriptName = 6
NameIDTrademarkNotice = 7
NameIDManufacturerName = 8
NameIDDesignerName = 9
NameIDFontDescription = 10
NameIDFontVendorURL = 11
NameIDFontDesignerURL = 12
NameIDFontLicense = 13
NameIDFontLicenseURL = 14
NameIDPreferredFamily = 16
NameIDPreferredSubfamily = 17
NameIDCompatibleName = 18
NameIDSampleText = 19
)
const (
@ -429,12 +429,12 @@ func (f *Font) Index(x rune) Index {
return 0
}
// Name returns the NameIDCode value of a Font.
// Name returns the NameID value of a Font.
// Returns "" on error or not found.
func (f *Font) Name(id NameIDCode) string {
func (f *Font) Name(id NameID) string {
x, platformID, err := parseSubtables(f.name, "name", 6, 12,
func(b []byte) bool {
return NameIDCode(u16(b, 6)) == id
return NameID(u16(b, 6)) == id
})
if err != nil {
return ""

2
truetype/truetype_test.go
View file

@ -228,7 +228,7 @@ func TestName(t *testing.T) {
}
continue
}
if got := f.Name(NameIDCodeFontFamily); got != want {
if got := f.Name(NameIDFontFamily); got != want {
t.Errorf("%s: got %q, want %q", name, got, want)
}
}