minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

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

tables.
This commit is contained in:
Werner Lemberg 2002-04-16 13:39:17 +00:00
parent 7d6784e0c7
commit 567caf08f3
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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.

16
src/pcf/pcfread.c
View File

@ -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;
}