* src/pcf/pcfread (pcf_get_accell): Fix parsing of accelerator
tables.
diff --git a/ChangeLog b/ChangeLog
index 1465534..f750488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-16 Francesco Zappa Nardelli <Francesco.Zappa.Nardelli@ens.fr>
+
+ * src/pcf/pcfread (pcf_get_accell): Fix parsing of accelerator
+ tables.
+
2002-04-15 David Turner <david@freetype.org>
* docs/FTL.txt: Formatting.
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 9a2966c..96f4841 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -819,21 +819,29 @@
goto Bail;
}
- error = pcf_get_metric( stream, format, &(accel->minbounds) );
+ 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;
}