diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-06-09 19:29:03 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-06-09 19:29:03 +0200 |
| commit | ee49e074127d93fccae763baaec3e93b6728ff80 (patch) | |
| tree | 99a277e9a0ed635ffc8aaf8179dcba5ebc0cf9cd /src/cff/cffgload.c | |
| parent | 989b6c878d007b154ca92273b4266686f8dbc315 (diff) | |
| parent | 77f63d23f7d380b0ff02c18fd6a154ab9063128a (diff) | |
| download | android_external_freetype-ee49e074127d93fccae763baaec3e93b6728ff80.tar.gz android_external_freetype-ee49e074127d93fccae763baaec3e93b6728ff80.tar.bz2 android_external_freetype-ee49e074127d93fccae763baaec3e93b6728ff80.zip | |
resolved conflicts for merge 77f63d to master
Diffstat (limited to 'src/cff/cffgload.c')
| -rw-r--r-- | src/cff/cffgload.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index c64c6f4..2718a27 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -4,7 +4,7 @@ /* */ /* OpenType Glyph Loader (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -420,7 +420,7 @@ sub = cff->subfonts[fd_index]; - if ( builder->hints_funcs ) + if ( builder->hints_funcs && size ) { CFF_Internal internal = (CFF_Internal)size->root.internal; |