ref: 370aea802c9ed3b8bd42ce8d1308c44e1487367b
parent: d087199f2c1388024b37fb3c3836e103aeded6c0
author: Werner Lemberg <[email protected]>
date: Tue Jun 8 04:37:11 EDT 2010
Formatting.
--- a/src/autofit/aflatin2.c
+++ b/src/autofit/aflatin2.c
@@ -545,7 +545,8 @@
FT_Pos fitted = ( scaled + 40 ) & ~63;
#if 1
- if ( scaled != fitted ) {+ if ( scaled != fitted )
+ {scale = FT_MulDiv( scale, fitted, scaled );
AF_LOG(( "== scaled x-top = %.2g fitted = %.2g, scaling = %.4g\n", scaled/64.0, fitted/64.0, (fitted*1.0)/scaled ));
}
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -98,7 +98,8 @@
#undef FT_USE_MODULE
#define FT_USE_MODULE( type, x ) MODULE_CLASS_##x,
- enum {+ enum
+ {#include FT_CONFIG_MODULES_H
FT_NUM_MODULE_CLASSES
};
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -1371,7 +1371,8 @@
/* If the property happens to be a comment, then it doesn't need */
/* to be added to the internal hash table. */
- if ( ft_memcmp( name, "COMMENT", 7 ) != 0 ) {+ if ( ft_memcmp( name, "COMMENT", 7 ) != 0 )
+ {/* Add the property to the font property table. */
error = hash_insert( fp->name,
font->props_used,
@@ -2344,7 +2345,8 @@
/* Make sure the comments are NULL terminated if they exist. */
memory = p->font->memory;
- if ( p->font->comments_len > 0 ) {+ if ( p->font->comments_len > 0 )
+ {if ( FT_RENEW_ARRAY( p->font->comments,
p->font->comments_len,
p->font->comments_len + 1 ) )
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -920,7 +920,8 @@
/* check whether the range contains at least one valid glyph; */
/* the constant is given in the CFF specification */
- if ( glyph_sid >= 65000L ) {+ if ( glyph_sid >= 65000L )
+ {FT_ERROR(( "cff_charset_load: invalid SID range\n" ));
error = CFF_Err_Invalid_File_Format;
goto Exit;
@@ -927,7 +928,8 @@
}
/* try to rescue some of the SIDs if `nleft' is too large */
- if ( nleft > 65000L - 1L || glyph_sid >= 65000L - nleft ) {+ if ( nleft > 65000L - 1L || glyph_sid >= 65000L - nleft )
+ {FT_ERROR(( "cff_charset_load: invalid SID range trimmed\n" ));
nleft = ( FT_UInt )( 65000L - 1L - glyph_sid );
}
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -329,7 +329,8 @@
goto Exit;
/* Remove non-significant digits. */
- if ( integer_length < 0 ) {+ if ( integer_length < 0 )
+ {number /= power_tens[-integer_length];
fraction_length += integer_length;
}
--- a/src/otvalid/otvmath.c
+++ b/src/otvalid/otvmath.c
@@ -248,7 +248,8 @@
otv_MathItalicsCorrectionInfo_validate(
table + MathTopAccentAttachment, valid, FALSE );
- if ( ExtendedShapeCoverage ) {+ if ( ExtendedShapeCoverage )
+ {OTV_NAME_ENTER( "ExtendedShapeCoverage" );
otv_Coverage_validate( table + ExtendedShapeCoverage, valid, -1 );
OTV_EXIT;
--- a/src/otvalid/otvmod.c
+++ b/src/otvalid/otvmod.c
@@ -214,7 +214,8 @@
*ot_jstf = (FT_Bytes)jstf;
Exit:
- if ( error ) {+ if ( error )
+ {FT_Memory memory = FT_FACE_MEMORY( face );
@@ -224,6 +225,7 @@
FT_FREE( gsub );
FT_FREE( jstf );
}
+
{FT_Memory memory = FT_FACE_MEMORY( face );
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -227,7 +227,8 @@
{prop = &face->properties[i];
- if ( prop ) {+ if ( prop )
+ {FT_FREE( prop->name );
if ( prop->isString )
FT_FREE( prop->value.atom );
--- a/src/psaux/afmparse.h
+++ b/src/psaux/afmparse.h
@@ -56,7 +56,8 @@
typedef struct AFM_ValueRec_
{enum AFM_ValueType_ type;
- union {+ union
+ {char* s;
FT_Fixed f;
FT_Int i;
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -1622,7 +1622,8 @@
if ( builder->parse_state == T1_Parse_Have_Path )
error = PSaux_Err_Ok;
- else {+ else
+ {builder->parse_state = T1_Parse_Have_Path;
error = t1_builder_add_contour( builder );
if ( !error )
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -370,7 +370,8 @@
if ( !error )
error = PSnames_Err_Invalid_Argument; /* No unicode chars here! */
}
- else {+ else
+ {/* Reallocate if the number of used entries is much smaller. */
if ( count < num_glyphs / 2 )
{--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -2787,7 +2787,8 @@
}
/* and the non-default table (these glyphs are specified here) */
- if ( nondefOff != 0 ) {+ if ( nondefOff != 0 )
+ {FT_Byte* ndp = table + nondefOff;
FT_ULong numMappings = TT_NEXT_ULONG( ndp );
FT_ULong i, lastUni = 0;
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -77,7 +77,8 @@
{/* For compatibility with Windows, we consider */
/* zero-length tables the same as missing tables. */
- if ( entry->Tag == tag ) {+ if ( entry->Tag == tag )
+ {if ( entry->Length != 0 )
{FT_TRACE4(( "found table.\n" ));
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -1728,7 +1728,8 @@
if ( distance && val < 0 )
val = 0;
}
- else {+ else
+ {val = distance - compensation;
if ( val > 0 )
val = 0;
--- a/src/type42/t42parse.c
+++ b/src/type42/t42parse.c
@@ -52,7 +52,8 @@
/* as Type42 fonts have no Private dict, */
/* we set the last argument of T1_FIELD_XXX to 0 */
static const
- T1_FieldRec t42_keywords[] = {+ T1_FieldRec t42_keywords[] =
+ {#undef FT_STRUCTURE
#define FT_STRUCTURE T1_FontInfo
@@ -268,7 +269,8 @@
temp_scale ) >> 16 );
/* we need to scale the values by 1.0/temp_scale */
- if ( temp_scale != 0x10000L ) {+ if ( temp_scale != 0x10000L )
+ {temp[0] = FT_DivFix( temp[0], temp_scale );
temp[1] = FT_DivFix( temp[1], temp_scale );
temp[2] = FT_DivFix( temp[2], temp_scale );