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

type1-subset: don't rename glyphs used by seac operator

Browse source 
Bug 70364
This commit is contained in:
Adrian Johnson 2013-10-11 19:59:50 +10:30
parent 0bb3d86645
commit 9e83625356
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cairo-type1-subset.c
View file

@ -1128,7 +1128,7 @@ write_used_glyphs (cairo_type1_font_subset_t *font,
cairo_status_t status;
char buffer[256];
int length;
int subset_id;
unsigned int subset_id;
int ch;
const char *wa_name;
@ -1142,13 +1142,14 @@ write_used_glyphs (cairo_type1_font_subset_t *font,
* font with the standard name.
**/
subset_id = font->glyphs[glyph_number].subset_index;
if (subset_id > 0) {
/* Any additional glyph included for use by the seac operator
* will either have subset_id >= font->scaled_font_subset->num_glyphs
* or will not map to a winansi name (wa_name = NULL). In this
* case the original name is used.
*/
if (subset_id > 0 && subset_id < font->scaled_font_subset->num_glyphs) {
ch = font->scaled_font_subset->to_latin_char[subset_id];
wa_name = _cairo_winansi_to_glyphname (ch);
/* If this subset contains any seac glyphs, additional non
* winansi glyphs (wa_name = NULL) may be included in the
* subset. In this case the original name is used.
*/
if (wa_name) {
name = wa_name;
name_length = strlen(name);