diff options
author | Werner Lemberg <wl@gnu.org> | 2008-06-24 11:19:03 +0000 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2008-06-24 11:19:03 +0000 |
commit | ce8853af8158368eae51b14c89dc3b79f48ce8ce (patch) | |
tree | 725b9c579e1a11e25800340bcef039247d5ff353 /src/raster | |
parent | 5563bea09317831f0a16fcc4add230806f007cac (diff) |
* src/truetype/ttinterp. (Ins_SCANTYPE): Don't check rendering mode.
* src/raster/ftraster.c (Render_Glyph, Render_Gray_Glyph,
Draw_Sweep): No-dropout mode is value 2, not value 0.
(Draw_Sweep): Really skip dropout handling for no-dropout mode.
Diffstat (limited to 'src/raster')
-rw-r--r-- | src/raster/ftraster.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index 684c566d..305d21c7 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -2893,17 +2893,19 @@ static const char count_table[256] = e1 = FLOOR( x1 ); e2 = CEILING( x2 ); - if ( ras.dropOutControl != 0 && - ( e1 > e2 || e2 == e1 + ras.precision ) ) + if ( e1 > e2 || e2 == e1 + ras.precision ) { - /* a drop out was detected */ + if ( ras.dropOutControl != 2 ) + { + /* a drop out was detected */ - P_Left ->X = x1; - P_Right->X = x2; + P_Left ->X = x1; + P_Right->X = x2; - /* mark profile for drop-out processing */ - P_Left->countL = 1; - dropouts++; + /* mark profile for drop-out processing */ + P_Left->countL = 1; + dropouts++; + } goto Skip_To_Next; } @@ -3123,7 +3125,7 @@ static const char count_table[256] = return error; /* Horizontal Sweep */ - if ( ras.second_pass && ras.dropOutControl != 0 ) + if ( ras.second_pass && ras.dropOutControl != 2 ) { ras.Proc_Sweep_Init = Horizontal_Sweep_Init; ras.Proc_Sweep_Span = Horizontal_Sweep_Span; @@ -3208,7 +3210,7 @@ static const char count_table[256] = return error; /* Horizontal Sweep */ - if ( ras.second_pass && ras.dropOutControl != 0 ) + if ( ras.second_pass && ras.dropOutControl != 2 ) { ras.Proc_Sweep_Init = Horizontal_Sweep_Init; ras.Proc_Sweep_Span = Horizontal_Gray_Sweep_Span; |