rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[smooth] Remove compiler warnings. 

* src/smooth/ftgrays.c (gray_convert_glyph): Fix reports from clang.
This commit is contained in:
Werner Lemberg 2016-06-21 11:39:34 +02:00
parent e3a1c46768
commit 20c6ef4c25
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.

12
src/smooth/ftgrays.c
View File

@ -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;
}