aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/autofit/afglobal.c
diff options
context:
space:
mode:
Diffstat (limited to 'freetype/src/autofit/afglobal.c')
-rw-r--r--freetype/src/autofit/afglobal.c9
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;