Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup the raster paint engine

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-06-29 22:45:52 +00:00
parent c453353492
commit df4f8b7782
1 changed files with 47 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
src/gui/painting/qgrayraster.c
View file

@ -401,7 +401,7 @@
{ {
TCoord ex1, ex2, fx1, fx2, delta; TCoord ex1, ex2, fx1, fx2, delta;
int p, first, dx; int p, first, dx;
int incr, lift, mod, rem; int incr, mod;
dx = x2 - x1; dx = x2 - x1;
@ -461,8 +461,8 @@
if ( ex1 != ex2 ) if ( ex1 != ex2 )
{ {
p = ONE_PIXEL * ( y2 - y1 + delta ); p = ONE_PIXEL * ( y2 - y1 + delta );
lift = (TCoord)( p / dx ); int lift = (TCoord)( p / dx );
rem = (TCoord)( p % dx ); int rem = (TCoord)( p % dx );
if ( rem < 0 ) if ( rem < 0 )
{ {
lift--; lift--;
@ -995,9 +995,7 @@
TPos area, TPos area,
int acount ) int acount )
{ {
QT_FT_Span* span;
int coverage; int coverage;
int skip;
/* compute the coverage line's coverage, depending on the */ /* compute the coverage line's coverage, depending on the */
@ -1036,7 +1034,7 @@
if ( coverage ) if ( coverage )
{ {
/* see whether we can add this span to the current list */ /* see whether we can add this span to the current list */
span = ras.gray_spans + ras.num_gray_spans - 1; QT_FT_Span* span = ras.gray_spans + ras.num_gray_spans - 1;
if ( ras.num_gray_spans > 0 && if ( ras.num_gray_spans > 0 &&
span->y == y && span->y == y &&
(int)span->x + span->len == (int)x && (int)span->x + span->len == (int)x &&
@ -1050,7 +1048,7 @@
{ {
if ( ras.render_span && ras.num_gray_spans > ras.skip_spans ) if ( ras.render_span && ras.num_gray_spans > ras.skip_spans )
{ {
skip = ras.skip_spans > 0 ? ras.skip_spans : 0; int skip = ras.skip_spans > 0 ? ras.skip_spans : 0;
ras.render_span( ras.num_gray_spans - skip, ras.render_span( ras.num_gray_spans - skip,
ras.gray_spans + skip, ras.gray_spans + skip,
ras.render_span_data ); ras.render_span_data );
@ -1061,20 +1059,12 @@
/* ras.render_span( span->y, ras.gray_spans, count ); */ /* ras.render_span( span->y, ras.gray_spans, count ); */
#ifdef DEBUG_GRAYS #ifdef DEBUG_GRAYS
fprintf( stderr, "y=%3d ", y );
if ( 1 ) span = ras.gray_spans;
{ for ( int n = 0; n < count; n++, span++ )
int n; fprintf( stderr, "[%d..%d]:%02x ",
span->x, span->x + span->len - 1, span->coverage );
fprintf( stderr, "\n" );
fprintf( stderr, "y=%3d ", y );
span = ras.gray_spans;
for ( n = 0; n < count; n++, span++ )
fprintf( stderr, "[%d..%d]:%02x ",
span->x, span->x + span->len - 1, span->coverage );
fprintf( stderr, "\n" );
}
#endif /* DEBUG_GRAYS */ #endif /* DEBUG_GRAYS */
ras.num_gray_spans = 0; ras.num_gray_spans = 0;
@ -1096,18 +1086,13 @@
#ifdef DEBUG_GRAYS #ifdef DEBUG_GRAYS
/* to be called while in the debugger */ /* to be called while in the debugger */
gray_dump_cells( RAS_ARG ) void gray_dump_cells( RAS_ARG )
{ {
int yindex; for ( int yindex = 0; yindex < ras.ycount; yindex++ )
for ( yindex = 0; yindex < ras.ycount; yindex++ )
{ {
PCell cell; PCell cell;
printf( "%3d:", yindex ); printf( "%3d:", yindex );
for ( cell = ras.ycells[yindex]; cell != NULL; cell = cell->next ) for ( cell = ras.ycells[yindex]; cell != NULL; cell = cell->next )
@ -1115,50 +1100,9 @@
printf( "\n" ); printf( "\n" );
} }
} }
#endif /* DEBUG_GRAYS */ #endif /* DEBUG_GRAYS */
static void
gray_sweep( RAS_ARG )
{
int yindex;
if ( ras.num_cells == 0 )
return;
for ( yindex = 0; yindex < ras.ycount; yindex++ )
{
PCell cell = ras.ycells[yindex];
TCoord cover = 0;
TCoord x = 0;
for ( ; cell != NULL; cell = cell->next )
{
TArea area;
if ( cell->x > x && cover != 0 )
gray_hline( RAS_VAR_ x, yindex, cover * ( ONE_PIXEL * 2 ),
cell->x - x );
cover += cell->cover;
area = cover * ( ONE_PIXEL * 2 ) - cell->area;
if ( area != 0 && cell->x >= 0 )
gray_hline( RAS_VAR_ cell->x, yindex, area, 1 );
x = cell->x + 1;
}
if ( ras.count_ex > x && cover != 0 )
gray_hline( RAS_VAR_ x, yindex, cover * ( ONE_PIXEL * 2 ),
ras.count_ex - x );
}
}
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* The following function should only compile in stand_alone mode, */ /* The following function should only compile in stand_alone mode, */
@ -1504,7 +1448,6 @@
{ {
PCell cells_max; PCell cells_max;
int yindex;
int cell_start, cell_end, cell_mod; int cell_start, cell_end, cell_mod;
@ -1528,7 +1471,7 @@
if ( ras.max_cells < 2 ) if ( ras.max_cells < 2 )
goto ReduceBands; goto ReduceBands;
for ( yindex = 0; yindex < ras.ycount; yindex++ ) for ( int yindex = 0; yindex < ras.ycount; yindex++ )
ras.ycells[yindex] = NULL; ras.ycells[yindex] = NULL;
} }
@ -1548,9 +1491,38 @@
error = ErrRaster_Memory_Overflow; error = ErrRaster_Memory_Overflow;
} }
if ( !error ) if ( !error && ras.num_cells != 0)
{ {
gray_sweep( RAS_VAR ); /* sweep */
for ( int yindex = 0; yindex < ras.ycount; yindex++ )
{
PCell cell = ras.ycells[yindex];
TCoord cover = 0;
TCoord x = 0;
for ( ; cell != NULL; cell = cell->next )
{
TArea area;
if ( cell->x > x && cover != 0 )
gray_hline( RAS_VAR_ x, yindex, cover * ( ONE_PIXEL * 2 ),
cell->x - x );
cover += cell->cover;
area = cover * ( ONE_PIXEL * 2 ) - cell->area;
if ( area != 0 && cell->x >= 0 )
gray_hline( RAS_VAR_ cell->x, yindex, area, 1 );
x = cell->x + 1;
}
if ( ras.count_ex > x && cover != 0 )
gray_hline( RAS_VAR_ x, yindex, cover * ( ONE_PIXEL * 2 ),
ras.count_ex - x );
}
band--; band--;
continue; continue;
} }
@ -1622,10 +1594,10 @@
return ErrRaster_OutOfMemory; return ErrRaster_OutOfMemory;
/* return immediately if the outline is empty */ /* return immediately if the outline is empty */
if ( outline->n_points == 0 || outline->n_contours <= 0 ) if ( !outline || outline->n_points == 0 || outline->n_contours <= 0 )
return 0; return 0;
if ( !outline || !outline->contours || !outline->points ) if ( !outline->contours || !outline->points )
return ErrRaster_Invalid_Outline; return ErrRaster_Invalid_Outline;
if ( outline->n_points != if ( outline->n_points !=