diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-06-19 00:45:41 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-06-19 00:46:50 +0100 |
| commit | 8ba9876bf2f31300cded47abc4296bd02977221e (patch) | |
| tree | 211bb61eb831a5efb7c891f94aee70fb0a036af3 /src/truetype/ttinterp.c | |
| parent | bad440fe256381ba38f6435984476f96dce7ba56 (diff) | |
| download | android_external_freetype-8ba9876bf2f31300cded47abc4296bd02977221e.tar.gz android_external_freetype-8ba9876bf2f31300cded47abc4296bd02977221e.tar.bz2 android_external_freetype-8ba9876bf2f31300cded47abc4296bd02977221e.zip | |
Revert "Upgrade FreeType to 2.4.10"cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1
This reverts commit 8bef833fa7b6f73a362a99dcaa83ee5a98f58e4d.
The different render breaks the Holo tests
Change-Id: I1db39c6ddad62eb5888e95b53f2b9e7ba46a6568
Diffstat (limited to 'src/truetype/ttinterp.c')
| -rw-r--r-- | src/truetype/ttinterp.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 3a8680f..3acb24a 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -52,7 +52,7 @@ /* */ /* In order to detect infinite loops in the code, we set up a counter */ /* within the run loop. A single stroke of interpretation is now */ - /* limited to a maximum number of opcodes defined below. */ + /* limited to a maximal number of opcodes defined below. */ /* */ #define MAX_RUNNABLE_OPCODES 1000000L @@ -1463,7 +1463,7 @@ #else - /* compute (a*b)/2^14 with maximum accuracy and rounding */ + /* compute (a*b)/2^14 with maximal accuracy and rounding */ static FT_Int32 TT_MulFix14( FT_Int32 a, FT_Int b ) @@ -1493,7 +1493,7 @@ #endif - /* compute (ax*bx+ay*by)/2^14 with maximum accuracy and rounding */ + /* compute (ax*bx+ay*by)/2^14 with maximal accuracy and rounding */ static FT_Int32 TT_DotFix14( FT_Int32 ax, FT_Int32 ay, @@ -3110,9 +3110,14 @@ CUR.GS.single_width_cutin = (FT_F26Dot6)args[0]; -#define DO_SSW \ - CUR.GS.single_width_value = TT_MULFIX( args[0], \ - CUR.tt_metrics.scale ); + /* XXX: UNDOCUMENTED! or bug in the Windows engine? */ + /* */ + /* It seems that the value that is read here is */ + /* expressed in 16.16 format rather than in font */ + /* units. */ + /* */ +#define DO_SSW \ + CUR.GS.single_width_value = (FT_F26Dot6)( args[0] >> 10 ); #define DO_FLIPON \ @@ -5767,7 +5772,7 @@ /* */ /* UNDOCUMENTED: According to Greg Hitchcock, there is one (virtual) */ /* contour in the twilight zone, namely contour number */ - /* zero which includes all points of it. */ + /* zero. */ /* */ static void Ins_SHC( INS_ARG ) |