Commit ef0a3e7e657dda6d006cf1524b89f7f395032b10
2016-06-28T22:56:22
[smooth] Minor clean-ups. * src/smooth/ftgrays.c (gray_TWorker): Remove redundant `ycount'. (gray_sweep, gray_convert_glyph, gray_dump_cells): Updated.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
diff --git a/ChangeLog b/ChangeLog
index 3125524..9929174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2016-06-26 Alexei Podtelezhnikov <apodtele@gmail.com>
+2016-06-28 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [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 <apodtele@gmail.com>
[smooth] Minor clean-ups.
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index 5889596..42f07f0 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -303,7 +303,7 @@ typedef ptrdiff_t FT_PtrDist;
#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 @@ typedef ptrdiff_t FT_PtrDist;
int span_y;
PCell* ycells;
- TPos ycount;
} gray_TWorker, *gray_PWorker;
@@ -486,7 +485,7 @@ typedef ptrdiff_t FT_PtrDist;
int yindex;
- for ( yindex = 0; yindex < ras.ycount; yindex++ )
+ for ( yindex = 0; yindex < ras.count_ey; yindex++ )
{
PCell cell;
@@ -1421,7 +1420,7 @@ typedef ptrdiff_t FT_PtrDist;
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 @@ typedef ptrdiff_t FT_PtrDist;
/* 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 @@ typedef ptrdiff_t FT_PtrDist;
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 @@ typedef ptrdiff_t FT_PtrDist;
/* be some problems. */
if ( middle == bottom )
{
-#ifdef FT_DEBUG_LEVEL_TRACE
FT_TRACE7(( "gray_convert_glyph: rotten glyph\n" ));
-#endif
return 1;
}