From fd90abb07c1b4733014ffeeba18b5236f3e9bf15 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 16 Apr 2002 13:38:43 +0000 Subject: * src/pcf/pcfread (pcf_get_accell): Fix parsing of accelerator tables. --- ChangeLog | 11 ++++++++++- src/pcf/pcfread.c | 18 ++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72791b24e..c47364310 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-16 Francesco Zappa Nardelli + + * src/pcf/pcfread (pcf_get_accell): Fix parsing of accelerator + tables. + 2002-03-29 KUSANO Takayuki * src/sfnt/sfobjs.c (Get_Name): Handle (3,0) name entries similar to @@ -16,7 +21,7 @@ 2002-03-25 David Turner * src/base/fttrigon.c, src/truetype/ttinterp.c: Fixing the TrueType - bytecode interpreter to compute the same values than FreeType 1. + bytecode interpreter to compute the same values as FreeType 1. The difference came from distinct algorithm for computing the dot product and vector lengths. It seems that TT bytecode @@ -39,9 +44,11 @@ 2002-03-08 David Turner + * Version 2.0.9 Released. ========================= + * README: updating the FTP addresses of the documentation * Jamfile.in, Jamfile: Adding the template file that will be used to @@ -165,9 +172,11 @@ 2002-02-08 David Turner + * Version 2.0.8 released. ========================= + * docs/CHANGES: Updating for 2.0.8. * include/freetype/freetype.h: Setting PATCH_LEVEL to 8 and diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 407613c7e..f54ba7e4b 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -821,21 +821,31 @@ THE SOFTWARE. goto Bail; } - error = pcf_get_metric( stream, format, &(accel->minbounds) ); + /* the accelerator tables never use compressed metrics */ + + error = pcf_get_metric( stream, + format & ( ~PCF_FORMAT_MASK ), + &(accel->minbounds) ); if ( error ) goto Bail; - error = pcf_get_metric( stream, format, &(accel->maxbounds) ); + error = pcf_get_metric( stream, + format & ( ~PCF_FORMAT_MASK ), + &(accel->maxbounds) ); if ( error ) goto Bail; if ( PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) ) { - error = pcf_get_metric( stream, format, &(accel->ink_minbounds) ); + error = pcf_get_metric( stream, + format & ( ~PCF_FORMAT_MASK ), + &(accel->ink_minbounds) ); if ( error ) goto Bail; - error = pcf_get_metric( stream, format, &(accel->ink_maxbounds) ); + error = pcf_get_metric( stream, + format & ( ~PCF_FORMAT_MASK ), + &(accel->ink_maxbounds) ); if ( error ) goto Bail; } -- cgit v1.2.1