projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CMAKE]
[reactos.git]
/
lib
/
3rdparty
/
freetype
/
src
/
autofit
/
afglobal.c
diff --git
a/lib/3rdparty/freetype/src/autofit/afglobal.c
b/lib/3rdparty/freetype/src/autofit/afglobal.c
index
ac29361
..
178c884
100644
(file)
--- a/
lib/3rdparty/freetype/src/autofit/afglobal.c
+++ b/
lib/3rdparty/freetype/src/autofit/afglobal.c
@@
-4,7
+4,7
@@
/* */
/* Auto-fitter routines to compute global hinting values (body). */
/* */
/* */
/* 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, */
/* 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++ )
{
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;
{
FT_Error error;
FT_Memory memory;
- AF_FaceGlobals globals;
+ AF_FaceGlobals globals
= NULL
;
memory = face->memory;
memory = face->memory;