ref: ef0a3e7e657dda6d006cf1524b89f7f395032b10
parent: c9cf359fd2a1047c270056e2f080586772fa7b33
author: Alexei Podtelezhnikov <[email protected]>
date: Tue Jun 28 18:56:22 EDT 2016
[smooth] Minor clean-ups. * src/smooth/ftgrays.c (gray_TWorker): Remove redundant `ycount'. (gray_sweep, gray_convert_glyph, gray_dump_cells): Updated.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2016-06-26 Alexei Podtelezhnikov <[email protected]>
+2016-06-28 Alexei Podtelezhnikov <[email protected]>
+
+ [smooth] Minor clean-ups.
+
+ * src/smooth/ftgrays.c (gray_TWorker): Remove redundant `ycount'.
+ (gray_sweep, gray_convert_glyph, gray_dump_cells): Updated.
+
+2016-06-27 Alexei Podtelezhnikov <[email protected]>
[smooth] Minor clean-ups.
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -303,7 +303,7 @@
#else /* FT_STATIC_RASTER */
-#define RAS_ARG /* empty */
+#define RAS_ARG void
#define RAS_ARG_ /* empty */
#define RAS_VAR /* empty */
#define RAS_VAR_ /* empty */
@@ -453,7 +453,6 @@
int span_y;
PCell* ycells;
- TPos ycount;
} gray_TWorker, *gray_PWorker;
@@ -486,7 +485,7 @@
int yindex;
- for ( yindex = 0; yindex < ras.ycount; yindex++ )
+ for ( yindex = 0; yindex < ras.count_ey; yindex++ )
{
PCell cell;
@@ -1421,7 +1420,7 @@
FT_TRACE7(( "gray_sweep: start\n" ));
- for ( yindex = 0; yindex < ras.ycount; yindex++ )
+ for ( yindex = 0; yindex < ras.count_ey; yindex++ )
{
PCell cell = ras.ycells[yindex];
TCoord cover = 0;
@@ -1919,8 +1918,8 @@
/* memory management */
{
- unsigned long ycount = (unsigned long)( band->max - band->min );
- unsigned long cell_start;
+ size_t ycount = (size_t)( band->max - band->min );
+ size_t cell_start;
cell_start = ( ycount * sizeof ( PCell ) + sizeof ( TCell ) - 1 ) /
@@ -1933,7 +1932,6 @@
ras.max_cells = (FT_PtrDist)( FT_MAX_GRAY_POOL - cell_start );
ras.ycells = (PCell*)buffer;
- ras.ycount = (TPos)ycount;
while ( ycount )
ras.ycells[--ycount] = NULL;
}
@@ -1965,9 +1963,7 @@
/* be some problems. */
if ( middle == bottom )
{
-#ifdef FT_DEBUG_LEVEL_TRACE
FT_TRACE7(( "gray_convert_glyph: rotten glyph\n" ));
-#endif
return 1;
}