From 348fffa8509629b2c68f2438ece9e020861a0c36 Mon Sep 17 00:00:00 2001 From: suzuki toshiya Date: Fri, 28 Nov 2014 16:05:59 +0900 Subject: [PATCH] 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}. --- ChangeLog | 8 ++++++++ src/pfr/pfrsbit.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2baff98ab..8f455c376 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-11-28 suzuki toshiya + + 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 [docmaker] Replace empty `' with CSS.. diff --git a/src/pfr/pfrsbit.c b/src/pfr/pfrsbit.c index cc4a9c9d3..979bf78a2 100644 --- 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",