diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2016-06-28 00:30:58 -0400 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2016-06-28 00:30:58 -0400 |
| commit | c9cf359fd2a1047c270056e2f080586772fa7b33 (patch) | |
| tree | 70e2abf7681d692409444d364b6d5572f51b7b88 | |
| parent | 999bcee2d7a3c65700f3e898f9a60585a973c376 (diff) | |
| download | freetype2-c9cf359fd2a1047c270056e2f080586772fa7b33.tar.gz | |
[smooth] Minor clean-ups.
* src/smooth/ftgrays.c (gray_convert_glyph): Do not use volatile
qualifier.
(gray_raster_render): Move span initializations from here.
(gray_sweep): ... to here and remove unused `target' argument.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/smooth/ftgrays.c | 21 |
2 files changed, 18 insertions, 12 deletions
@@ -1,5 +1,14 @@ 2016-06-26 Alexei Podtelezhnikov <apodtele@gmail.com> + [smooth] Minor clean-ups. + + * src/smooth/ftgrays.c (gray_convert_glyph): Do not use volatile + qualifier. + (gray_raster_render): Move span initializations from here. + (gray_sweep): ... to here and remove unused `target' argument. + +2016-06-26 Alexei Podtelezhnikov <apodtele@gmail.com> + [pcf] Fix handling of very large fonts (#47708). * src/pcf/pcfread.c (pcf_get_encodings): Make `encodingOffset' an diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 140ec8ec9..5889596d5 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -1408,17 +1408,16 @@ typedef ptrdiff_t FT_PtrDist; static void - gray_sweep( RAS_ARG_ const FT_Bitmap* target ) + gray_sweep( RAS_ARG ) { int yindex; - FT_UNUSED( target ); - if ( ras.num_cells == 0 ) return; ras.num_gray_spans = 0; + ras.span_y = 0; FT_TRACE7(( "gray_sweep: start\n" )); @@ -1884,12 +1883,12 @@ typedef ptrdiff_t FT_PtrDist; static int gray_convert_glyph( RAS_ARG ) { - TCell buffer[FT_MAX_GRAY_POOL]; - const int band_size = FT_MAX_GRAY_POOL / 8; - gray_TBand bands[40]; - gray_TBand* volatile band; - int volatile n, num_bands; - TPos volatile min, max, max_y; + TCell buffer[FT_MAX_GRAY_POOL]; + const int band_size = FT_MAX_GRAY_POOL / 8; + gray_TBand bands[40]; + gray_TBand* band; + int n, num_bands; + TPos min, max, max_y; /* set up vertical bands */ @@ -1949,7 +1948,7 @@ typedef ptrdiff_t FT_PtrDist; if ( !error ) { - gray_sweep( RAS_VAR_ &ras.target ); + gray_sweep( RAS_VAR ); band--; continue; } @@ -2075,8 +2074,6 @@ typedef ptrdiff_t FT_PtrDist; ras.count_ey = ras.max_ey - ras.min_ey; ras.outline = *outline; - ras.num_gray_spans = 0; - ras.span_y = 0; if ( params->flags & FT_RASTER_FLAG_DIRECT ) { |