ref: 348fffa8509629b2c68f2438ece9e020861a0c36
parent: 46d4dc86e1036d9a8852e533c80b98c5123ce4c4
author: suzuki toshiya <[email protected]>
date: Fri Nov 28 11:05:59 EST 2014
Fix compiler warning to the comparison between signed and
unsigned variable.
* src/pfr/pfrsbit.c (pfr_slot_load_bitmap): Fix the comparison
between `ypos + ysize' and FT_INT_{MAX,MIN}.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-11-28 suzuki toshiya <[email protected]>
+
+ Fix compiler warning to the comparison between signed and
+ unsigned variable.
+
+ * src/pfr/pfrsbit.c (pfr_slot_load_bitmap): Fix the comparison
+ between `ypos + ysize' and FT_INT_{MAX,MIN}.+
2014-11-27 Werner Lemberg <[email protected]>
[docmaker] Replace empty `<td>' with CSS..
--- a/src/pfr/pfrsbit.c
+++ b/src/pfr/pfrsbit.c
@@ -636,8 +636,9 @@
* which causes a size truncation, because truncated
* size properties makes bitmap glyph broken.
*/
- if ( xpos > FT_INT_MAX || ( ypos + ysize ) > FT_INT_MAX ||
- xpos < FT_INT_MIN || ( ypos + ysize ) < FT_INT_MIN )
+ if ( xpos > FT_INT_MAX || xpos < FT_INT_MIN ||
+ ysize > FT_INT_MAX || ypos + ysize > FT_INT_MAX ||
+ ypos + (FT_Long)ysize < FT_INT_MIN )
{FT_TRACE1(( "pfr_slot_load_bitmap:" ));
FT_TRACE1(( "huge bitmap glyph %dx%d over FT_GlyphSlot\n",