ReFuel/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/cff/cffparse.c (cff_parse_num): Simplify.

Browse Source
This commit is contained in:
Werner Lemberg 2017-01-03 06:53:13 +01:00
parent 248eaa4f60
commit 69414e7afd
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,7 @@
2017-01-03 Werner Lemberg <wl@gnu.org>
* src/cff/cffparse.c (cff_parse_num): Simplify.
2017-01-03 Werner Lemberg <wl@gnu.org>
Various fixes for clang's undefined behaviour sanitizer.
@ -6,8 +10,8 @@
(cff_blend_doBlend): Don't left-shift negative numbers.
Handle 5-byte numbers byte by byte to avoid alignment issues.
* src/cff/cffparse.c (cff_parse): Handle 5-byte numbers byte by byte
to avoid alignment issues.
* src/cff/cffparse.c (cff_parse_num): Handle 5-byte numbers byte by
byte to avoid alignment issues.
* src/cid/cidload (cid_read_subrs): Do nothing if we don't have any
subrs.

20
src/cff/cffparse.c
View File

@ -448,13 +448,21 @@
/* 16.16 fixed point is used internally for CFF2 blend results. */
/* Since these are trusted values, a limit check is not needed. */
/* After the 255, 4 bytes give the number. */
/* Blend result is rounded to integer. */
/* After the 255, 4 bytes give the number. */
/* The blend value is converted to integer, with rounding; */
/* due to the right-shift we don't need the lowest byte. */
#if 0
return (FT_Short)(
( ( ( (FT_ULong)*( d[0] + 1 ) << 24 ) |
( (FT_ULong)*( d[0] + 2 ) << 16 ) |
( (FT_ULong)*( d[0] + 3 ) << 8 ) |
(FT_ULong)*( d[0] + 4 ) ) + 0x8000U ) >> 16 );
( ( ( (FT_UInt32)*( d[0] + 1 ) << 24 ) |
( (FT_UInt32)*( d[0] + 2 ) << 16 ) |
( (FT_UInt32)*( d[0] + 3 ) << 8 ) |
(FT_UInt32)*( d[0] + 4 ) ) + 0x8000U ) >> 16 );
#else
return (FT_Short)(
( ( ( (FT_UInt32)*( d[0] + 1 ) << 16 ) |
( (FT_UInt32)*( d[0] + 2 ) << 8 ) |
(FT_UInt32)*( d[0] + 3 ) ) + 0x80U ) >> 8 );
#endif
}
else