diff options
author | Nick Kralevich <nnk@google.com> | 2010-09-16 11:32:17 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:32:17 -0700 |
commit | cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b (patch) | |
tree | 2b4c5412391bf31f6a54b237ea83bfde05ec3802 /src/base/ftglyph.c | |
parent | f2873c598230898219f9481ffb43edc5e4d3f806 (diff) | |
parent | aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c (diff) | |
download | android_external_freetype-cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b.tar.gz android_external_freetype-cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b.tar.bz2 android_external_freetype-cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b.zip |
am aacb8e13: upgrade freetype to 2.4.2.
Merge commit 'aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c'
* commit 'aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c':
upgrade freetype to 2.4.2.
Diffstat (limited to 'src/base/ftglyph.c')
-rw-r--r-- | src/base/ftglyph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c index 3505d6d..b220508 100644 --- a/src/base/ftglyph.c +++ b/src/base/ftglyph.c @@ -4,7 +4,7 @@ /* */ /* FreeType convenience functions to handle glyphs (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2007, 2008 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -282,7 +282,7 @@ { FT_Memory memory = library->memory; FT_Error error; - FT_Glyph glyph; + FT_Glyph glyph = NULL; *aglyph = 0; |