diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/psaux/t1cmap.c | 2 | ||||
| -rw-r--r-- | src/type1/t1load.c | 19 | ||||
| -rw-r--r-- | src/type42/t42objs.c | 9 |
3 files changed, 10 insertions, 20 deletions
diff --git a/src/psaux/t1cmap.c b/src/psaux/t1cmap.c index bbe75cb3..f933e4da 100644 --- a/src/psaux/t1cmap.c +++ b/src/psaux/t1cmap.c @@ -179,7 +179,7 @@ cmap->first = encoding->code_first; - cmap->count = (FT_UInt)( encoding->code_last - cmap->first + 1 ); + cmap->count = (FT_UInt)( encoding->code_last - cmap->first ); cmap->indices = encoding->char_index; FT_ASSERT( cmap->indices != NULL ); diff --git a/src/type1/t1load.c b/src/type1/t1load.c index 807f95dc..d867e942 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -2182,8 +2182,8 @@ /* the index is then stored in type1.encoding.char_index, and */ /* a the name to type1.encoding.char_name */ - min_char = +32000; - max_char = -32000; + min_char = 0; + max_char = 0; charcode = 0; for ( ; charcode < loader.encoding_table.max_elems; charcode++ ) @@ -2209,25 +2209,14 @@ { if ( charcode < min_char ) min_char = charcode; - if ( charcode > max_char ) - max_char = charcode; + if ( charcode >= max_char ) + max_char = charcode + 1; } break; } } } - /* - * Yes, this happens: Certain PDF-embedded fonts have only a - * `.notdef' glyph defined! - */ - - if ( min_char > max_char ) - { - min_char = 0; - max_char = loader.encoding_table.max_elems; - } - type1->encoding.code_first = min_char; type1->encoding.code_last = max_char; type1->encoding.num_chars = loader.num_chars; diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c index c0002ae3..9081ffc6 100644 --- a/src/type42/t42objs.c +++ b/src/type42/t42objs.c @@ -100,8 +100,8 @@ /* The index is then stored in type1.encoding.char_index, and */ /* the name in type1.encoding.char_name */ - min_char = +32000; - max_char = -32000; + min_char = 0; + max_char = 0; charcode = 0; for ( ; charcode < loader.encoding_table.max_elems; charcode++ ) @@ -127,13 +127,14 @@ { if ( charcode < min_char ) min_char = charcode; - if ( charcode > max_char ) - max_char = charcode; + if ( charcode >= max_char ) + max_char = charcode + 1; } break; } } } + type1->encoding.code_first = min_char; type1->encoding.code_last = max_char; type1->encoding.num_chars = loader.num_chars; |