diff options
author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-07-03 18:01:34 +0900 |
---|---|---|
committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-07-03 18:01:34 +0900 |
commit | 009c39c1d99da8248215a3421f61981fbb856b51 (patch) | |
tree | f19a75f4fa0dd2097e35dc35f3728bf6ef67ec04 | |
parent | 19714ca65b913d6bdf064a2a92ce36b48adb14b9 (diff) | |
download | freetype2-009c39c1d99da8248215a3421f61981fbb856b51.tar.gz |
truetype: Cast the project vector to 32-bit for LP64 system.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | src/truetype/ttinterp.c | 4 |
2 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + truetype: Cast the project vector to 32-bit for LP64 system. + + * src/truetype/ttinterp.c (Project, DualProject): + Insert casts from FT_Pos (the arguments `dx', `dy') + to FT_UInt32 (the argument to TT_DotFix14()). + +2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + truetype: Cast the scaling params to 32-bit for LP64 system. * src/truetype/ttgload.c (TT_Process_Composite_Component): diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index a3346ce68..3904c43cc 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -2194,7 +2194,7 @@ FT_ASSERT( !CUR.face->unpatented_hinting ); #endif - return TT_DotFix14( dx, dy, + return TT_DotFix14( (FT_UInt32)dx, (FT_UInt32)dy, CUR.GS.projVector.x, CUR.GS.projVector.y ); } @@ -2220,7 +2220,7 @@ Dual_Project( EXEC_OP_ FT_Pos dx, FT_Pos dy ) { - return TT_DotFix14( dx, dy, + return TT_DotFix14( (FT_UInt32)dx, (FT_UInt32)dy, CUR.GS.dualVector.x, CUR.GS.dualVector.y ); } |