diff options
| author | marha <marha@users.sourceforge.net> | 2015-02-22 14:47:01 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-02-22 14:47:01 +0100 |
| commit | 7785694244cdfc5939ca4754cab4e08bd6980f99 (patch) | |
| tree | e317021c83941073a12d69494425f0dbcbc9eaf8 /freetype/src/autofit/afglobal.c | |
| parent | c9aad1ae6227c434d480d1d3aa8eae3c3c910c18 (diff) | |
| download | vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.tar.gz vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.tar.bz2 vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.zip | |
Upgraded to freetype 2.5.5
Diffstat (limited to 'freetype/src/autofit/afglobal.c')
| -rw-r--r-- | freetype/src/autofit/afglobal.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/freetype/src/autofit/afglobal.c b/freetype/src/autofit/afglobal.c index 7aa2e1102..a54c20c02 100644 --- a/freetype/src/autofit/afglobal.c +++ b/freetype/src/autofit/afglobal.c @@ -138,7 +138,7 @@ FT_Byte* gstyles = globals->glyph_styles; FT_UInt ss; FT_UInt i; - FT_UInt dflt = -1; + FT_UInt dflt = ~0U; /* a non-valid value */ /* the value AF_STYLE_UNASSIGNED means `uncovered glyph' */ @@ -176,7 +176,8 @@ */ if ( style_class->coverage == AF_COVERAGE_DEFAULT ) { - if ( style_class->script == globals->module->default_script ) + if ( (FT_UInt)style_class->script == + globals->module->default_script ) dflt = ss; for ( range = script_class->script_uni_ranges; @@ -332,8 +333,8 @@ af_face_globals_free( globals ); globals = NULL; } - - globals->increase_x_height = AF_PROP_INCREASE_X_HEIGHT_MAX; + else + globals->increase_x_height = AF_PROP_INCREASE_X_HEIGHT_MAX; Exit: *aglobals = globals; |