summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2016-06-21 11:39:34 +0200
committerWerner Lemberg <wl@gnu.org>2016-06-21 11:39:34 +0200
commit20c6ef4c25b6a4f1e8b284b1b0898c675f19a476 (patch)
tree9a80e810048e22818fd66e256173025cef347a01
parente3a1c46768571ae6953db29da23fdaddbf448f99 (diff)
downloadfreetype2-20c6ef4c25b6a4f1e8b284b1b0898c675f19a476.tar.gz
[smooth] Remove compiler warnings.
* src/smooth/ftgrays.c (gray_convert_glyph): Fix reports from clang.
-rw-r--r--ChangeLog6
-rw-r--r--src/smooth/ftgrays.c12
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 <wl@gnu.org>
+
+ [smooth] Remove compiler warnings.
+
+ * src/smooth/ftgrays.c (gray_convert_glyph): Fix reports from clang.
+
2016-06-20 Alexei Podtelezhnikov <apodtele@gmail.com>
[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;
}