From 20c6ef4c25b6a4f1e8b284b1b0898c675f19a476 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 21 Jun 2016 11:39:34 +0200 Subject: [PATCH] [smooth] Remove compiler warnings. * src/smooth/ftgrays.c (gray_convert_glyph): Fix reports from clang. --- ChangeLog | 6 ++++++ src/smooth/ftgrays.c | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14a797505..e64765d57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-06-20 Werner Lemberg + + [smooth] Remove compiler warnings. + + * src/smooth/ftgrays.c (gray_convert_glyph): Fix reports from clang. + 2016-06-20 Alexei Podtelezhnikov [smooth] Sanitize memory managenent. diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index aef6a47e4..cf0cd1310 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -1940,21 +1940,21 @@ typedef ptrdiff_t FT_PtrDist; /* memory management */ { - int ycount = band->max - band->min; - int cell_start; + unsigned long ycount = (unsigned long)( band->max - band->min ); + unsigned long cell_start; - cell_start = ( ycount * sizeof( PCell ) + sizeof( TCell ) - 1 ) / - sizeof( TCell ); + cell_start = ( ycount * sizeof ( PCell ) + sizeof ( TCell ) - 1 ) / + sizeof ( TCell ); if ( FT_MAX_GRAY_POOL - cell_start < 2 ) goto ReduceBands; ras.cells = (PCell)ras.buffer + cell_start; - ras.max_cells = FT_MAX_GRAY_POOL - cell_start; + ras.max_cells = (FT_PtrDist)( FT_MAX_GRAY_POOL - cell_start ); ras.ycells = (PCell*)ras.buffer; - ras.ycount = ycount; + ras.ycount = (TPos)ycount; while ( ycount ) ras.ycells[--ycount] = NULL; }