diff options
author | marha <marha@users.sourceforge.net> | 2015-02-22 14:47:01 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-02-22 14:47:01 +0100 |
commit | 7785694244cdfc5939ca4754cab4e08bd6980f99 (patch) | |
tree | e317021c83941073a12d69494425f0dbcbc9eaf8 /freetype/src/base/ftglyph.c | |
parent | c9aad1ae6227c434d480d1d3aa8eae3c3c910c18 (diff) | |
download | vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.tar.gz vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.tar.bz2 vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.zip |
Upgraded to freetype 2.5.5
Diffstat (limited to 'freetype/src/base/ftglyph.c')
-rw-r--r-- | freetype/src/base/ftglyph.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/freetype/src/base/ftglyph.c b/freetype/src/base/ftglyph.c index c62b3db0c..ac178c41b 100644 --- a/freetype/src/base/ftglyph.c +++ b/freetype/src/base/ftglyph.c @@ -4,7 +4,7 @@ /* */ /* FreeType convenience functions to handle glyphs (body). */ /* */ -/* Copyright 1996-2005, 2007, 2008, 2010, 2012, 2013 by */ +/* Copyright 1996-2005, 2007, 2008, 2010, 2012-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -314,13 +314,13 @@ /* check arguments */ - if ( !target ) + if ( !target || !source || !source->clazz ) { error = FT_THROW( Invalid_Argument ); goto Exit; } - *target = 0; + *target = NULL; if ( !source || !source->clazz ) { @@ -359,7 +359,7 @@ FT_Error error; FT_Glyph glyph; - const FT_Glyph_Class* clazz = 0; + const FT_Glyph_Class* clazz = NULL; if ( !slot ) @@ -512,7 +512,7 @@ FT_BitmapGlyph bitmap = NULL; const FT_Glyph_Class* clazz; - /* FT_BITMAP_GLYPH_CLASS_GET derefers `library' in PIC mode */ + /* FT_BITMAP_GLYPH_CLASS_GET dereferences `library' in PIC mode */ FT_Library library; |