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

[smooth] Reduce stack of band boundaries. 

* src/smooth/ftgrays.c (gray_TBand): Removed.
(gray_convert_glyph): Updated to stack band boundaries concisely.
This commit is contained in:
Alexei Podtelezhnikov 2016-08-27 23:25:54 -04:00
parent 57aa83911a
commit 4d3f7ca8ce
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2016-08-27 Alexei Podtelezhnikov <apodtele@gmail.com>
[smooth] Reduce stack of band boundaries.
* src/smooth/ftgrays.c (gray_TBand): Removed.
(gray_convert_glyph): Updated to stack band boundaries concisely.
2016-08-26 Werner Lemberg <wl@gnu.org> 2016-08-26 Werner Lemberg <wl@gnu.org>
* src/cid/cidload.c (cid_face_open): Improve handling of `SDBytes'. * src/cid/cidload.c (cid_face_open): Improve handling of `SDBytes'.

47
src/smooth/ftgrays.c
View File

@ -1765,13 +1765,6 @@ typedef ptrdiff_t FT_PtrDist;
#endif /* STANDALONE_ */ #endif /* STANDALONE_ */
typedef struct gray_TBand_
{
TCoord min, max;
} gray_TBand;
FT_DEFINE_OUTLINE_FUNCS( FT_DEFINE_OUTLINE_FUNCS(
func_interface, func_interface,
@ -1818,12 +1811,12 @@ typedef ptrdiff_t FT_PtrDist;
static int static int
gray_convert_glyph( RAS_ARG ) gray_convert_glyph( RAS_ARG )
{ {
TCell buffer[FT_MAX_GRAY_POOL]; TCell buffer[FT_MAX_GRAY_POOL];
TCoord band_size = FT_MAX_GRAY_POOL / 8; TCoord band_size = FT_MAX_GRAY_POOL / 8;
int num_bands; int num_bands;
TCoord min, max, max_y; TCoord min, max, max_y;
gray_TBand bands[32]; /* enough to accommodate bisections */ TCoord bands[32]; /* enough to accommodate bisections */
gray_TBand* band; TCoord* band;
/* set up vertical bands */ /* set up vertical bands */
@ -1843,19 +1836,19 @@ typedef ptrdiff_t FT_PtrDist;
if ( max > max_y ) if ( max > max_y )
max = max_y; max = max_y;
bands[0].min = min; band = bands;
bands[0].max = max; band[1] = min;
band = bands; band[0] = max;
do do
{ {
TCoord bottom, top, middle; TCoord width = band[0] - band[1];
int error; int error;
/* memory management */ /* memory management */
{ {
size_t ycount = (size_t)( band->max - band->min ); size_t ycount = (size_t)width;
size_t cell_start; size_t cell_start;
@ -1875,9 +1868,9 @@ typedef ptrdiff_t FT_PtrDist;
ras.num_cells = 0; ras.num_cells = 0;
ras.invalid = 1; ras.invalid = 1;
ras.min_ey = band->min; ras.min_ey = band[1];
ras.max_ey = band->max; ras.max_ey = band[0];
ras.count_ey = band->max - band->min; ras.count_ey = width;
error = gray_convert_glyph_inner( RAS_VAR ); error = gray_convert_glyph_inner( RAS_VAR );
@ -1892,23 +1885,19 @@ typedef ptrdiff_t FT_PtrDist;
ReduceBands: ReduceBands:
/* render pool overflow; we will reduce the render band by half */ /* render pool overflow; we will reduce the render band by half */
bottom = band->min; width >>= 1;
top = band->max;
middle = bottom + ( ( top - bottom ) >> 1 );
/* This is too complex for a single scanline; there must */ /* This is too complex for a single scanline; there must */
/* be some problems. */ /* be some problems. */
if ( middle == bottom ) if ( width == 0 )
{ {
FT_TRACE7(( "gray_convert_glyph: rotten glyph\n" )); FT_TRACE7(( "gray_convert_glyph: rotten glyph\n" ));
return 1; return 1;
} }
band[1].min = bottom;
band[1].max = middle;
band[0].min = middle;
band[0].max = top;
band++; band++;
band[1] = band[0];
band[0] += width;
} while ( band >= bands ); } while ( band >= bands );
} }