diff options
author | marha <marha@users.sourceforge.net> | 2012-03-12 10:33:22 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-12 10:33:22 +0100 |
commit | 41bd254198b8b879a562a85f7dc868c3c0f7fbc1 (patch) | |
tree | 3db49b4d73b8c4c734c1382ab5469a4f9f8baf93 /freetype/src/type42/t42parse.c | |
parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
download | vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.gz vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.bz2 vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.zip |
Updated to freetype-2.4.9
Diffstat (limited to 'freetype/src/type42/t42parse.c')
-rw-r--r-- | freetype/src/type42/t42parse.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/freetype/src/type42/t42parse.c b/freetype/src/type42/t42parse.c index 577426917..468b46334 100644 --- a/freetype/src/type42/t42parse.c +++ b/freetype/src/type42/t42parse.c @@ -4,7 +4,7 @@ /* */ /* Type 42 font parser (body). */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by */ +/* Copyright 2002-2012 by */ /* Roberto Alameda. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -175,7 +175,7 @@ if ( ft_memcmp( stream->cursor, "%!PS-TrueTypeFont", 17 ) != 0 ) { - FT_TRACE2(( "not a Type42 font\n" )); + FT_TRACE2(( " not a Type42 font\n" )); error = T42_Err_Unknown_File_Format; } @@ -607,8 +607,9 @@ goto Fail; } - /* A string can have a trailing zero byte for padding. Ignore it. */ - if ( string_buf[string_size - 1] == 0 && ( string_size % 2 == 1 ) ) + /* A string can have a trailing zero (odd) byte for padding. */ + /* Ignore it. */ + if ( ( string_size & 1 ) && string_buf[string_size - 1] == 0 ) string_size--; if ( !string_size ) |