rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[psaux] Change subfont synthesis for CID fonts. 

Change t1_make_subfont to take in the Private dict record as an argument.
This is because Type 1 and CID font records in FreeType have this in different
places.

* src/psaux/psobjs.c (t1_make_subfont): Change T1_Face to FT_Face so that
CID is also accepted.
Take PS_Private as an argument and let caller figure out where the Private
dict actually is.
Update references.

* include/freetype/internal/psaux.h, src/psaux/psobjs.h: Update declaration.
* src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String): Update call.
This commit is contained in:
Ewald Hew 2017-07-24 12:05:19 +08:00
parent 6e52516e97
commit 76e9d80adc
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/freetype/internal/psaux.h
View File

@ -1291,10 +1291,10 @@ FT_BEGIN_HEADER
PS_Decoder* ps_decoder );
void
(*t1_make_subfont)( T1_Face face,
(*t1_make_subfont)( FT_Face face,
PS_Private priv,
CFF_SubFont subfont );
T1_CMap_Classes t1_cmap_classes;
/* fields after this comment line were added after version 2.1.10 */

18
src/psaux/psobjs.c
View File

@ -2329,10 +2329,10 @@
FT_LOCAL_DEF( void )
t1_make_subfont( T1_Face face,
t1_make_subfont( FT_Face face,
PS_Private priv,
CFF_SubFont subfont )
{
PS_Private priv = &face->type1.private_dict;
CFF_Private cpriv = &subfont->private_dict;
FT_UInt n, count;
@ -2379,20 +2379,18 @@
/* Initialize the random number generator. */
if ( face->root.internal->random_seed != -1 )
if ( face->internal->random_seed != -1 )
{
/* . If we have a face-specific seed, use it. */
/* If non-zero, update it to a positive value. */
subfont->random = (FT_UInt32)face->root.internal->random_seed;
if ( face->root.internal->random_seed )
subfont->random = (FT_UInt32)face->internal->random_seed;
if ( face->internal->random_seed )
{
do
{
face->root.internal->random_seed =
(FT_Int32)((PSAux_Service)face->psaux)->cff_random(
(FT_UInt32)face->root.internal->random_seed );
} while ( face->root.internal->random_seed < 0 );
face->internal->random_seed = (FT_Int32)cff_random(
(FT_UInt32)face->internal->random_seed );
} while ( face->internal->random_seed < 0 );
}
}
if ( !subfont->random )

3
src/psaux/psobjs.h
View File

@ -285,7 +285,8 @@ FT_BEGIN_HEADER
/*************************************************************************/
FT_LOCAL( void )
t1_make_subfont( T1_Face face,
t1_make_subfont( FT_Face face,
PS_Private priv,
CFF_SubFont subfont );
FT_LOCAL( void )

2
src/type1/t1gload.c
View File

@ -112,7 +112,7 @@
psaux->ps_decoder_init( decoder, TRUE, &psdecoder );
psaux->t1_make_subfont( face, &subfont );
psaux->t1_make_subfont( FT_FACE( face ), &face->type1.private_dict, &subfont );
psdecoder.current_subfont = &subfont;
error = decoder_funcs->parse_charstrings( &psdecoder,