aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/raster
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-08-20 07:57:52 +0000
committermarha <marha@users.sourceforge.net>2010-08-20 07:57:52 +0000
commit00666832a756014eef48c4f5bd8484cc1299bdf0 (patch)
tree6cdcf53e663300699a7e96fe58010600eb7badf3 /freetype/src/raster
parent0ef233ddca61b9f3c72aa5f806ee818348f3aa20 (diff)
downloadvcxsrv-00666832a756014eef48c4f5bd8484cc1299bdf0.tar.gz
vcxsrv-00666832a756014eef48c4f5bd8484cc1299bdf0.tar.bz2
vcxsrv-00666832a756014eef48c4f5bd8484cc1299bdf0.zip
Updated to freetype 2.4.2
Diffstat (limited to 'freetype/src/raster')
-rw-r--r--freetype/src/raster/ftraster.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/freetype/src/raster/ftraster.c b/freetype/src/raster/ftraster.c
index ff3e12c7b..ce6fdfe51 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;