ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix more invalid left-shifts. 

* src/pfr/pfrgload.c (pfr_glyph_load_compound): Use multiplication,
not left-shift.

* src/truetype/ttgxvar.c (ft_var_load_avar, ft_var_load_gvar,
tt_face_vary_cvt, TT_Vary_Apply_Glyph_Deltas): Use multiplication,
not left-shift.
This commit is contained in:
Werner Lemberg 2015-08-02 09:42:12 +02:00
parent 6343ba22a3
commit 70e9d81577
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2015-08-02 Werner Lemberg <wl@gnu.org>
Fix more invalid left-shifts.
* src/pfr/pfrgload.c (pfr_glyph_load_compound): Use multiplication,
not left-shift.
* src/truetype/ttgxvar.c (ft_var_load_avar, ft_var_load_gvar,
tt_face_vary_cvt, TT_Vary_Apply_Glyph_Deltas): Use multiplication,
not left-shift.
2015-07-31 Werner Lemberg <wl@gnu.org> 2015-07-31 Werner Lemberg <wl@gnu.org>
Fix some bugs found by clang's `-fsanitize=undefined' (#45661). Fix some bugs found by clang's `-fsanitize=undefined' (#45661).

4
src/pfr/pfrgload.c
View File

@ -632,14 +632,14 @@
if ( format & PFR_SUBGLYPH_XSCALE ) if ( format & PFR_SUBGLYPH_XSCALE )
{ {
PFR_CHECK( 2 ); PFR_CHECK( 2 );
subglyph->x_scale = PFR_NEXT_SHORT( p ) << 4; subglyph->x_scale = PFR_NEXT_SHORT( p ) * 16;
} }
subglyph->y_scale = 0x10000L; subglyph->y_scale = 0x10000L;
if ( format & PFR_SUBGLYPH_YSCALE ) if ( format & PFR_SUBGLYPH_YSCALE )
{ {
PFR_CHECK( 2 ); PFR_CHECK( 2 );
subglyph->y_scale = PFR_NEXT_SHORT( p ) << 4; subglyph->y_scale = PFR_NEXT_SHORT( p ) * 16;
} }
/* read offset */ /* read offset */

18
src/truetype/ttgxvar.c
View File

@ -357,8 +357,8 @@
for ( j = 0; j < segment->pairCount; j++ ) for ( j = 0; j < segment->pairCount; j++ )
{ {
/* convert to Fixed */ /* convert to Fixed */
segment->correspondence[j].fromCoord = FT_GET_SHORT() << 2; segment->correspondence[j].fromCoord = FT_GET_SHORT() * 4;
segment->correspondence[j].toCoord = FT_GET_SHORT() << 2; segment->correspondence[j].toCoord = FT_GET_SHORT() * 4;
FT_TRACE5(( " mapping %.4f to %.4f\n", FT_TRACE5(( " mapping %.4f to %.4f\n",
segment->correspondence[j].fromCoord / 65536.0, segment->correspondence[j].fromCoord / 65536.0,
@ -514,7 +514,7 @@
for ( j = 0 ; j < (FT_UInt)gvar_head.axisCount; j++ ) for ( j = 0 ; j < (FT_UInt)gvar_head.axisCount; j++ )
{ {
blend->tuplecoords[i * gvar_head.axisCount + j] = blend->tuplecoords[i * gvar_head.axisCount + j] =
FT_GET_SHORT() << 2; /* convert to FT_Fixed */ FT_GET_SHORT() * 4; /* convert to FT_Fixed */
FT_TRACE5(( "%.4f ", FT_TRACE5(( "%.4f ",
blend->tuplecoords[i * gvar_head.axisCount + j] / 65536.0 )); blend->tuplecoords[i * gvar_head.axisCount + j] / 65536.0 ));
} }
@ -1379,7 +1379,7 @@
if ( tupleIndex & GX_TI_EMBEDDED_TUPLE_COORD ) if ( tupleIndex & GX_TI_EMBEDDED_TUPLE_COORD )
{ {
for ( j = 0; j < blend->num_axis; j++ ) for ( j = 0; j < blend->num_axis; j++ )
tuple_coords[j] = FT_GET_SHORT() << 2; /* convert from */ tuple_coords[j] = FT_GET_SHORT() * 4; /* convert from */
/* short frac to fixed */ /* short frac to fixed */
} }
else else
@ -1397,9 +1397,9 @@
if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE ) if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
{ {
for ( j = 0; j < blend->num_axis; j++ ) for ( j = 0; j < blend->num_axis; j++ )
im_start_coords[j] = FT_GET_SHORT() << 2; im_start_coords[j] = FT_GET_SHORT() * 4;
for ( j = 0; j < blend->num_axis; j++ ) for ( j = 0; j < blend->num_axis; j++ )
im_end_coords[j] = FT_GET_SHORT() << 2; im_end_coords[j] = FT_GET_SHORT() * 4;
} }
apply = ft_var_apply_tuple( blend, apply = ft_var_apply_tuple( blend,
@ -1850,7 +1850,7 @@
if ( tupleIndex & GX_TI_EMBEDDED_TUPLE_COORD ) if ( tupleIndex & GX_TI_EMBEDDED_TUPLE_COORD )
{ {
for ( j = 0; j < blend->num_axis; j++ ) for ( j = 0; j < blend->num_axis; j++ )
tuple_coords[j] = FT_GET_SHORT() << 2; /* convert from */ tuple_coords[j] = FT_GET_SHORT() * 4; /* convert from */
/* short frac to fixed */ /* short frac to fixed */
} }
else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) >= blend->tuplecount ) else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) >= blend->tuplecount )
@ -1867,9 +1867,9 @@
if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE ) if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
{ {
for ( j = 0; j < blend->num_axis; j++ ) for ( j = 0; j < blend->num_axis; j++ )
im_start_coords[j] = FT_GET_SHORT() << 2; im_start_coords[j] = FT_GET_SHORT() * 4;
for ( j = 0; j < blend->num_axis; j++ ) for ( j = 0; j < blend->num_axis; j++ )
im_end_coords[j] = FT_GET_SHORT() << 2; im_end_coords[j] = FT_GET_SHORT() * 4;
} }
apply = ft_var_apply_tuple( blend, apply = ft_var_apply_tuple( blend,