* src/cff/cffparse.c, src/cid/cidload.c, src/type1/t1load.c: fixed
the incorrect EM size computation
This commit is contained in:
parent
ebe85f59c9
commit
09d55ceabf
|
@ -1,5 +1,8 @@
|
||||||
2001-05-11 David Turner <david@freetype.org>
|
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,
|
* include/freetype/fttrigon.h, src/base/fttrigon.c, src/base/ftbase.c,
|
||||||
src/base/Jamfile, src/base/rules.mk: adding trigonometric functions
|
src/base/Jamfile, src/base/rules.mk: adding trigonometric functions
|
||||||
to the core API (using Cordic algorithms).
|
to the core API (using Cordic algorithms).
|
||||||
|
|
|
@ -334,8 +334,7 @@
|
||||||
|
|
||||||
temp = ABS( matrix->yy );
|
temp = ABS( matrix->yy );
|
||||||
|
|
||||||
*upm = (FT_UShort)( FT_DivFix( 0x10000L,
|
*upm = (FT_UShort)FT_DivFix( 0x10000L, FT_DivFix( temp, 1000 ) );
|
||||||
FT_DivFix( temp, 1000 ) ) >> 16 );
|
|
||||||
|
|
||||||
if ( temp != 0x10000L )
|
if ( temp != 0x10000L )
|
||||||
{
|
{
|
||||||
|
|
|
@ -201,7 +201,7 @@
|
||||||
/* `1000/temp_scale', because temp_scale was already multiplied by */
|
/* `1000/temp_scale', because temp_scale was already multiplied by */
|
||||||
/* 1000 (in t1_tofixed(), from psobjs.c). */
|
/* 1000 (in t1_tofixed(), from psobjs.c). */
|
||||||
root->units_per_EM = (FT_UShort)( FT_DivFix( 0x10000L,
|
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] */
|
/* we need to scale the values by 1.0/temp[3] */
|
||||||
if ( temp_scale != 0x10000L )
|
if ( temp_scale != 0x10000L )
|
||||||
|
|
|
@ -895,8 +895,8 @@
|
||||||
/* 1000 / temp_scale, because temp_scale was already multiplied by */
|
/* 1000 / temp_scale, because temp_scale was already multiplied by */
|
||||||
/* 1000 (in t1_tofixed, from psobjs.c). */
|
/* 1000 (in t1_tofixed, from psobjs.c). */
|
||||||
|
|
||||||
root->units_per_EM = (FT_UShort)( FT_DivFix( 0x10000L,
|
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_scale */
|
/* we need to scale the values by 1.0/temp_scale */
|
||||||
if ( temp_scale != 0x10000L )
|
if ( temp_scale != 0x10000L )
|
||||||
|
@ -1194,7 +1194,7 @@
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* initialize tables (leaving room for addition of .notdef, */
|
/* initialize tables (leaving room for addition of .notdef, */
|
||||||
/* if necessary). */
|
/* if necessary). */
|
||||||
|
|
||||||
error = psaux->ps_table_funcs->init( code_table,
|
error = psaux->ps_table_funcs->init( code_table,
|
||||||
loader->num_glyphs + 1,
|
loader->num_glyphs + 1,
|
||||||
|
|
Loading…
Reference in New Issue