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/base/ftrfork.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/base/ftrfork.c')
-rw-r--r-- | src/base/ftrfork.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c index 719570d..d59a076 100644 --- a/src/base/ftrfork.c +++ b/src/base/ftrfork.c @@ -4,7 +4,7 @@ /* */ /* Embedded resource forks accessor (body). */ /* */ -/* Copyright 2004, 2005, 2006, 2007, 2008 by */ +/* Copyright 2004, 2005, 2006, 2007, 2008, 2009 by */ /* Masatake YAMATO and Redhat K.K. */ /* */ /* FT_Raccess_Get_HeaderInfo() and raccess_guess_darwin_hfsplus() are */ @@ -709,8 +709,12 @@ return FT_Err_Ok; } else - FT_Stream_Skip( stream, 4 + 4 ); /* offset + length */ + { + error = FT_Stream_Skip( stream, 4 + 4 ); /* offset + length */ + if ( error ) + return error; } + } return FT_Err_Unknown_File_Format; } |