shithub: freetype+ttf2subf

Download patch

ref: 9928df86f27f4b5e3d50c8526a96df236285952e
parent: 33686f37514e1ef68bb6c15a8dabaf868d595c02
author: Werner Lemberg <[email protected]>
date: Tue Apr 16 09:39:17 EDT 2002 

* src/pcf/pcfread (pcf_get_accell): Fix parsing of accelerator
tables.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-16  Francesco Zappa Nardelli  <[email protected]>
+
+	* src/pcf/pcfread (pcf_get_accell): Fix parsing of accelerator
+	tables.
+
 2002-04-15  David Turner  <[email protected]>
 
 	* docs/FTL.txt: Formatting.
--- 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;
     }