diff options
| author | Nick Kralevich <nnk@google.com> | 2010-09-14 17:02:58 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2010-09-15 10:32:30 -0700 |
| commit | aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c (patch) | |
| tree | 2b4c5412391bf31f6a54b237ea83bfde05ec3802 /src/autofit/afglobal.c | |
| parent | d4476115dee94297c020b3a2b067188117424e25 (diff) | |
| download | android_external_freetype-aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c.tar.gz android_external_freetype-aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c.tar.bz2 android_external_freetype-aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c.zip | |
upgrade freetype to 2.4.2.
Bug: 2969145
Change-Id: I8debbbe0bd478d9cf8c39cff5179981b5f3b371a
Diffstat (limited to 'src/autofit/afglobal.c')
| -rw-r--r-- | src/autofit/afglobal.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c index ac29361..178c884 100644 --- a/src/autofit/afglobal.c +++ b/src/autofit/afglobal.c @@ -4,7 +4,7 @@ /* */ /* Auto-fitter routines to compute global hinting values (body). */ /* */ -/* Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */ +/* Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -167,8 +167,11 @@ for ( nn = 0; nn < globals->glyph_count; nn++ ) { - if ( gscripts[nn] == AF_SCRIPT_LIST_NONE ) - gscripts[nn] = AF_SCRIPT_LIST_DEFAULT; + if ( ( gscripts[nn] & ~AF_DIGIT ) == AF_SCRIPT_LIST_NONE ) + { + gscripts[nn] &= ~AF_SCRIPT_LIST_NONE; + gscripts[nn] |= AF_SCRIPT_LIST_DEFAULT; + } } } @@ -183,7 +186,7 @@ { FT_Error error; FT_Memory memory; - AF_FaceGlobals globals; + AF_FaceGlobals globals = NULL; memory = face->memory; |