diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-11-18 09:26:24 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-11-18 09:26:24 -0500 |
| commit | 192927225c447a8eaba613838aff93f82dee41d0 (patch) | |
| tree | 49b5a5b31d50c50014f1ec5dce0a690568c38818 /src | |
| parent | 3e5e83e12e051d6ac734f08609c6c584b0f0b807 (diff) | |
[fc-glyphname] Rename internal arrays to prefix with _fc_
Although they were static, I was still surprised that gdb was seeing
our variable "glyphs". Not helpful.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fcfreetype.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/fcfreetype.c b/src/fcfreetype.c index c30826e5..68596f5a 100644 --- a/src/fcfreetype.c +++ b/src/fcfreetype.c @@ -2326,10 +2326,10 @@ FcUcs4ToGlyphName (FcChar32 ucs4) int r = 0; FcGlyphId gn; - while ((gn = ucs_to_name[i]) != -1) + while ((gn = _fc_ucs_to_name[i]) != -1) { - if (glyphs[gn].ucs == ucs4) - return glyphs[gn].name; + if (_fc_glyph_names[gn].ucs == ucs4) + return _fc_glyph_names[gn].name; if (!r) { r = (int) (ucs4 % FC_GLYPHNAME_REHASH); @@ -2351,10 +2351,10 @@ FcGlyphNameToUcs4 (FcChar8 *name) int r = 0; FcGlyphId gn; - while ((gn = name_to_ucs[i]) != -1) + while ((gn = _fc_name_to_ucs[i]) != -1) { - if (!strcmp ((char *) name, (char *) glyphs[gn].name)) - return glyphs[gn].ucs; + if (!strcmp ((char *) name, (char *) _fc_glyph_names[gn].name)) + return _fc_glyph_names[gn].ucs; if (!r) { r = (int) (h % FC_GLYPHNAME_REHASH); @@ -2952,7 +2952,6 @@ FcFontCapabilities(FT_Face face) FT_ULong *gsubtags=NULL, *gpostags=NULL; FT_UShort gsub_count=0, gpos_count=0; FT_ULong maxsize; - FT_Memory memory = face->stream->memory; FcChar8 *complex_ = NULL; int indx1 = 0, indx2 = 0; |