diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-08-17 18:21:28 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-08-17 18:25:40 +0200 |
| commit | aeb407daf3711a10a27f3bc2223c5eb05158076e (patch) | |
| tree | 570010914e8c91992ea388f2319611655c7d4b0c /src/sfnt/sfdriver.c | |
| parent | 3053d1b9db55099918843889e4809ce97483ca9f (diff) | |
| download | android_external_freetype-aeb407daf3711a10a27f3bc2223c5eb05158076e.tar.gz android_external_freetype-aeb407daf3711a10a27f3bc2223c5eb05158076e.tar.bz2 android_external_freetype-aeb407daf3711a10a27f3bc2223c5eb05158076e.zip | |
Update to FreeType 2.4.6+
This patch updates our copy of the FreeType sources to 2.4.6+.
More precisely, it contains source code corresponding to the
state of the upstream repository at the following hash
submitted on August 16 2001:
c3fb981e2ac79acad09d5673352646696472f55e
This corresponds to 2.4.6 with 7 more patches applied on top
of it to fix bugs in the TrueType interpreter and the CFF parser.
Change-Id: I9f3ac736d616020c8d10fd1d4e4be466f35fb6e7
Diffstat (limited to 'src/sfnt/sfdriver.c')
| -rw-r--r-- | src/sfnt/sfdriver.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index b74679b..247aa67 100644 --- a/src/sfnt/sfdriver.c +++ b/src/sfnt/sfdriver.c @@ -4,7 +4,7 @@ /* */ /* High-level SFNT driver interface (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by */ +/* Copyright 1996-2007, 2009-2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -117,15 +117,20 @@ FT_ULong *offset, FT_ULong *length ) { - if ( !tag || !offset || !length ) + if ( !offset || !length ) return SFNT_Err_Invalid_Argument; - if ( idx >= face->num_tables ) - return SFNT_Err_Table_Missing; + if ( !tag ) + *length = face->num_tables; + else + { + if ( idx >= face->num_tables ) + return SFNT_Err_Table_Missing; - *tag = face->dir_tables[idx].Tag; - *offset = face->dir_tables[idx].Offset; - *length = face->dir_tables[idx].Length; + *tag = face->dir_tables[idx].Tag; + *offset = face->dir_tables[idx].Offset; + *length = face->dir_tables[idx].Length; + } return SFNT_Err_Ok; } |