From ef873514945a8892a5bc350d01052f6e7b242949 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 10 Sep 2001 06:55:43 +0000 Subject: [PATCH] formatting --- ChangeLog | 19 ++++++++++--------- src/psaux/psobjs.c | 1 + src/type1/t1load.c | 13 ++++++------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95937c8e1..6df13e4c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,19 +1,20 @@ -2001-08-30 Martin Muskens +2001-08-30 Martin Muskens - * src/type1/t1load.c (parse_font_matrix): a new way to compute the - units per EM with greater accuracy (important for embedded T1 fonts in - PDF documents that were automatically generated from TrueType ones). + * src/type1/t1load.c (parse_font_matrix): A new way to compute the + units per EM with greater accuracy (important for embedded T1 fonts + in PDF documents that were automatically generated from TrueType + ones). - * src/type1/t1load.c (is_alpha): now supports "+" in font names, this - is used in embedded fonts.. + * src/type1/t1load.c (is_alpha): Now supports "+" in font names; + this is used in embedded fonts. - * src/psaux/psobjs.c (PS_Table_Add): fixed a reallocation bug that + * src/psaux/psobjs.c (PS_Table_Add): Fixed a reallocation bug that generated a dangling pointer reference. 2001-08-30 Anthony Feik - * src/type1/t1afm.c (T1_Read_Afm): now correctly sets the flag - FT_FACE_FLAG_KERNING when appropriate for Type1 + AFM files.. + * src/type1/t1afm.c (T1_Read_Afm): Now correctly sets the flag + FT_FACE_FLAG_KERNING when appropriate for Type1 + AFM files. 2001-08-25 Werner Lemberg diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 92e5b0eb0..a21008495 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -167,6 +167,7 @@ FT_Offset new_size = table->capacity; FT_Long in_offset; + in_offset = (FT_Long)((FT_Byte*)object - table->block); if ( (FT_ULong)in_offset >= table->capacity ) in_offset = -1; diff --git a/src/type1/t1load.c b/src/type1/t1load.c index b4a9a9afd..ce6607ff3 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -767,7 +767,7 @@ is_alpha( FT_Byte c ) { /* Note: we must accept "+" as a valid character, as it is used in */ - /* embedded type1 fonts in PDF documents.. */ + /* embedded type1 fonts in PDF documents. */ /* */ return ( isalnum( c ) || c == '.' || c == '_' || c == '-' || c == '+' ); } @@ -894,13 +894,12 @@ temp_scale = ABS( temp[3] ); - /* Set Units per EM based on FontMatrix values. We set the value to */ - /* 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( 1000*0x10000L, - temp_scale ) >> 16); + /* Set Units per EM based on FontMatrix values. We set the value to */ + /* 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( 1000 * 0x10000L, + temp_scale ) >> 16 ); /* we need to scale the values by 1.0/temp_scale */ if ( temp_scale != 0x10000L )