Commit 9928df86f27f4b5e3d50c8526a96df236285952e
2002-04-16T13:39:17
* src/pcf/pcfread (pcf_get_accell): Fix parsing of accelerator tables.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
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 @@ THE SOFTWARE.
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;
}