diff options
| author | David Turner <david@freetype.org> | 2001-05-11 18:08:58 +0000 |
|---|---|---|
| committer | David Turner <david@freetype.org> | 2001-05-11 18:08:58 +0000 |
| commit | 61b3ea2f5f0280bb0b20816e1c5b6198bbbdd2ab (patch) | |
| tree | 3e872d83799ffb26a75360b5b7dbe320d04c0783 | |
| parent | 6f30f9b3a34c55e5e19c53e168850b27b94677e0 (diff) | |
| download | freetype2-61b3ea2f5f0280bb0b20816e1c5b6198bbbdd2ab.tar.gz | |
* src/cff/cffparse.c, src/cid/cidload.c, src/type1/t1load.c: fixed
the incorrect EM size computation
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/cff/cffparse.c | 3 | ||||
| -rw-r--r-- | src/cid/cidload.c | 2 | ||||
| -rw-r--r-- | src/type1/t1load.c | 6 |
4 files changed, 8 insertions, 6 deletions
@@ -1,5 +1,8 @@ 2001-05-11 David Turner <david@freetype.org> + * src/cff/cffparse.c, src/cid/cidload.c, src/type1/t1load.c: fixed + the incorrect EM size computation + * include/freetype/fttrigon.h, src/base/fttrigon.c, src/base/ftbase.c, src/base/Jamfile, src/base/rules.mk: adding trigonometric functions to the core API (using Cordic algorithms). diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c index 9570ce29e..833676bce 100644 --- a/src/cff/cffparse.c +++ b/src/cff/cffparse.c @@ -334,8 +334,7 @@ temp = ABS( matrix->yy ); - *upm = (FT_UShort)( FT_DivFix( 0x10000L, - FT_DivFix( temp, 1000 ) ) >> 16 ); + *upm = (FT_UShort)FT_DivFix( 0x10000L, FT_DivFix( temp, 1000 ) ); if ( temp != 0x10000L ) { diff --git a/src/cid/cidload.c b/src/cid/cidload.c index 06bdffe50..5e7b1885b 100644 --- a/src/cid/cidload.c +++ b/src/cid/cidload.c @@ -201,7 +201,7 @@ /* `1000/temp_scale', because temp_scale was already multiplied by */ /* 1000 (in t1_tofixed(), from psobjs.c). */ root->units_per_EM = (FT_UShort)( FT_DivFix( 0x10000L, - FT_DivFix( temp_scale, 1000 ) ) >> 16 ); + FT_DivFix( temp_scale, 1000 ) ) ); /* we need to scale the values by 1.0/temp[3] */ if ( temp_scale != 0x10000L ) diff --git a/src/type1/t1load.c b/src/type1/t1load.c index 2691b9bd1..b848c9786 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -895,8 +895,8 @@ /* 1000 / temp_scale, because temp_scale was already multiplied by */ /* 1000 (in t1_tofixed, from psobjs.c). */ - root->units_per_EM = (FT_UShort)( FT_DivFix( 0x10000L, - FT_DivFix( temp_scale, 1000 ) ) >> 16 ); + root->units_per_EM = (FT_UShort)FT_DivFix( 0x10000L, + FT_DivFix( temp_scale, 1000 ) ); /* we need to scale the values by 1.0/temp_scale */ if ( temp_scale != 0x10000L ) @@ -1194,7 +1194,7 @@ return; /* initialize tables (leaving room for addition of .notdef, */ - /* if necessary). */ + /* if necessary). */ error = psaux->ps_table_funcs->init( code_table, loader->num_glyphs + 1, |