fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-02 21:18:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cff: opentype fonts always use gid to lookup glyph

Browse source 
Bug 91902
This commit is contained in:
Adrian Johnson 2015-09-07 22:20:08 +09:30
parent f6c46d9473
commit b353d1f1b1
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/cairo-cff-subset.c
View file

@ -1780,7 +1780,7 @@ cairo_cff_font_subset_charstrings_and_subroutines (cairo_cff_font_t *font)
font->subset_subroutines = TRUE;
for (i = 0; i < font->scaled_font_subset->num_glyphs; i++) {
if (font->is_cid) {
if (font->is_cid && !font->is_opentype) {
cid = font->scaled_font_subset->glyphs[i];
status = cairo_cff_font_get_gid_for_cid (font, cid, &glyph);
if (unlikely (status))
@ -1847,11 +1847,15 @@ cairo_cff_font_subset_fontdict (cairo_cff_font_t *font)
font->num_subset_fontdicts = 0;
for (i = 0; i < font->scaled_font_subset->num_glyphs; i++) {
cid = font->scaled_font_subset->glyphs[i];
status = cairo_cff_font_get_gid_for_cid (font, cid, &gid);
if (unlikely (status)) {
free (reverse_map);
return status;
if (font->is_opentype) {
gid = font->scaled_font_subset->glyphs[i];
} else {
cid = font->scaled_font_subset->glyphs[i];
status = cairo_cff_font_get_gid_for_cid (font, cid, &gid);
if (unlikely (status)) {
free (reverse_map);
return status;
}
}
fd = font->fdselect[gid];