diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-20 08:28:36 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-20 08:28:36 +0000 |
| commit | f5d6fd32902e742cc62622b1abc8826dd7c03c32 (patch) | |
| tree | 96c33069543f425f5f70045e24b549a5783c73d1 /freetype/src/raster/ftraster.c | |
| parent | 3799f1085abb02c5721f4c33f42c063edb68029d (diff) | |
| parent | 00666832a756014eef48c4f5bd8484cc1299bdf0 (diff) | |
| download | vcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.tar.gz vcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.tar.bz2 vcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'freetype/src/raster/ftraster.c')
| -rw-r--r-- | freetype/src/raster/ftraster.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/freetype/src/raster/ftraster.c b/freetype/src/raster/ftraster.c index bf34d1d58..c7245166d 100644 --- a/freetype/src/raster/ftraster.c +++ b/freetype/src/raster/ftraster.c @@ -1931,18 +1931,21 @@ y1 = SCALED( point[-2].y ); x2 = SCALED( point[-1].x ); y2 = SCALED( point[-1].y ); - x3 = SCALED( point[ 0].x ); - y3 = SCALED( point[ 0].y ); if ( flipped ) { SWAP_( x1, y1 ); SWAP_( x2, y2 ); - SWAP_( x3, y3 ); } if ( point <= limit ) { + x3 = SCALED( point[0].x ); + y3 = SCALED( point[0].y ); + + if ( flipped ) + SWAP_( x3, y3 ); + if ( Cubic_To( RAS_VARS x1, y1, x2, y2, x3, y3 ) ) goto Fail; continue; @@ -2495,7 +2498,7 @@ PByte p; - p = bits - e1*ras.target.pitch; + p = bits - e1 * ras.target.pitch; if ( ras.target.pitch > 0 ) p += ( ras.target.rows - 1 ) * ras.target.pitch; |