From 3a037af81022b2e7cc5a51fdd7020c30a41066e6 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 28 Apr 2002 02:48:20 +0000 Subject: [PATCH] * src/cache/ftccache.c (ftc_cache_lookup), src/cache/ftccmap.c (ftc_cmap_family_init), src/cache/ftcmanag.c (ftc_family_table_alloc), src/cache/ftcsbits.c (FTC_SBit_Cache_Lookup): Use FTC_Err_*. src/cache/ftcimage.c (FTC_Image_Cache_Lookup): Use FTC_Err_*. (FTC_ImageCache_Lookup): Fix handling of invalid arguments. --- ChangeLog | 9 +++++++++ src/cache/ftccache.c | 3 +-- src/cache/ftccmap.c | 4 ++-- src/cache/ftcimage.c | 10 ++++------ src/cache/ftcmanag.c | 2 +- src/cache/ftcsbits.c | 2 +- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3efb04402..a16167971 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-04-28 Werner Lemberg + + * src/cache/ftccache.c (ftc_cache_lookup), + src/cache/ftccmap.c (ftc_cmap_family_init), + src/cache/ftcmanag.c (ftc_family_table_alloc), + src/cache/ftcsbits.c (FTC_SBit_Cache_Lookup): Use FTC_Err_*. + src/cache/ftcimage.c (FTC_Image_Cache_Lookup): Use FTC_Err_*. + (FTC_ImageCache_Lookup): Fix handling of invalid arguments. + 2002-04-22 Werner Lemberg * builds/unix/configure.ac: Set `version_info' to 9:1:3 (FT2 diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c index e55dcb7ba..3a3ef5b43 100644 --- a/src/cache/ftccache.c +++ b/src/cache/ftccache.c @@ -512,7 +512,6 @@ FT_LruNode lru; - /* some argument checks are delayed to ftc_glyph_cache_lookup */ if ( !cache || !query || !anode ) return FTC_Err_Invalid_Argument; @@ -534,7 +533,7 @@ { FT_ERROR(( "ftc_cache_lookup: invalid query (bad 'family' field)\n" )); - return FT_Err_Invalid_Argument; + return FTC_Err_Invalid_Argument; } if ( *bucket ) diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c index 7dfabc2ad..6b774ad10 100644 --- a/src/cache/ftccmap.c +++ b/src/cache/ftccmap.c @@ -32,7 +32,7 @@ /* codes to equivalent glyph indices. */ /* */ /* For now, the implementation is very basic: Each node maps a range of */ - /* 128 consecutive character codes to their correspondingglyph indices. */ + /* 128 consecutive character codes to their corresponding glyph indices. */ /* */ /* We could do more complex things, but I don't think it is really very */ /* useful. */ @@ -228,7 +228,7 @@ Bad_Descriptor: FT_ERROR(( "ftp_cmap_family_init: invalid charmap descriptor\n" )); - return FT_Err_Invalid_Argument; + return FTC_Err_Invalid_Argument; } diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c index 86ecd09bd..101db8574 100644 --- a/src/cache/ftcimage.c +++ b/src/cache/ftcimage.c @@ -324,11 +324,9 @@ FT_Error error; - /* some argument checks are delayed to ftc_glyph_cache_lookup */ - if ( aglyph ) - *aglyph = NULL; - - *aglyph = NULL; + /* some argument checks are delayed to ftc_cache_lookup */ + if ( !aglyph ) + return FTC_Err_Invalid_Argument; if ( anode ) *anode = NULL; @@ -374,7 +372,7 @@ if ( !desc ) - return FT_Err_Invalid_Argument; + return FTC_Err_Invalid_Argument; desc0.font = desc->font; desc0.type = (FT_UInt32)desc->image_type; diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index 271154003..7cdb8f9da 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -400,7 +400,7 @@ else { FT_ERROR(( "ftc_family_table_alloc: internal bug!" )); - return FT_Err_Invalid_Argument; + return FTC_Err_Invalid_Argument; } entry->link = FTC_FAMILY_ENTRY_NONE; diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c index 82ab84c37..5b03c2086 100644 --- a/src/cache/ftcsbits.c +++ b/src/cache/ftcsbits.c @@ -516,7 +516,7 @@ if ( !desc ) - return FT_Err_Invalid_Argument; + return FTC_Err_Invalid_Argument; desc0.font = desc->font; desc0.type = (FT_UInt32)desc->image_type;