From 35fd84b96a776f9e2aa1972dc07d650603e2a6d2 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 8 Mar 2005 06:00:35 +0000 Subject: [PATCH] Formatting. --- ChangeLog | 7 ++++--- include/freetype/freetype.h | 6 +++--- src/autofit/aflatin.c | 6 +++--- src/otvalid/otvgpos.c | 6 +++--- src/otvalid/otvgsub.c | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1c95cecd..c5e793f3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,10 @@ 2005-03-06 David Turner - * src/otvalid/{otvgsub.c, otvgpos.c}: making static tables constant + * src/otvalid/otvgsub.c, src/otvalid/otvgpos.c: Make static tables + constant. - * src/autofit/aflatin.c (af_latin_metrics_init): fixing bug #12212 - (auto-hinter refuses to work if no Unicode charmap in font) + * src/autofit/aflatin.c (af_latin_metrics_init): Fix Savannah bug + #12212 (auto-hinter refuses to work if no Unicode charmap in font). 2005-03-05 Werner Lemberg diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 697f8e70d..63eeda114 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -4,7 +4,7 @@ /* */ /* FreeType high-level API and common types (specification only). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -2652,13 +2652,13 @@ FT_BEGIN_HEADER /* */ /* */ /* Retrieves the ASCII Postscript name of a given face, if available. */ - /* This should only work with Postscript and TrueType fonts. */ + /* This only works with Postscript and TrueType fonts. */ /* */ /* */ /* face :: A handle to the source face object. */ /* */ /* */ - /* A pointer to the face's Postscript name. NULL if un-available. */ + /* A pointer to the face's Postscript name. NULL if unavailable. */ /* */ /* */ /* The returned pointer is owned by the face and will be destroyed */ diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c index 574ab7d40..c6fc17fe5 100644 --- a/src/autofit/aflatin.c +++ b/src/autofit/aflatin.c @@ -377,7 +377,7 @@ af_latin_metrics_init( AF_LatinMetrics metrics, FT_Face face ) { - FT_Error error = 0; + FT_Error error = FT_Err_Ok; FT_CharMap oldmap = face->charmap; FT_UInt ee; @@ -397,7 +397,7 @@ for ( ee = 0; latin_encodings[ee] != FT_ENCODING_NONE; ee++ ) { error = FT_Select_Charmap( face, latin_encodings[ee] ); - if (!error) + if ( !error ) break; } @@ -408,7 +408,7 @@ } FT_Set_Charmap( face, oldmap ); - return 0; + return FT_Err_Ok; } diff --git a/src/otvalid/otvgpos.c b/src/otvalid/otvgpos.c index 3791d541d..ceffd2f8e 100644 --- a/src/otvalid/otvgpos.c +++ b/src/otvalid/otvgpos.c @@ -4,7 +4,7 @@ /* */ /* OpenType GPOS table validation (body). */ /* */ -/* Copyright 2002, 2004 by */ +/* Copyright 2002, 2004, 2005 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -954,7 +954,7 @@ OTV_Validator valid ) { valid->type_count = 9; - valid->type_funcs = (OTV_Validate_Func*) otv_gpos_validate_funcs; + valid->type_funcs = (OTV_Validate_Func*)otv_gpos_validate_funcs; otv_Lookup_validate( table, valid ); } @@ -996,7 +996,7 @@ LookupList = FT_NEXT_USHORT( p ); valid->type_count = 9; - valid->type_funcs = (OTV_Validate_Func*) otv_gpos_validate_funcs; + valid->type_funcs = (OTV_Validate_Func*)otv_gpos_validate_funcs; valid->glyph_count = glyph_count; otv_LookupList_validate( table + LookupList, diff --git a/src/otvalid/otvgsub.c b/src/otvalid/otvgsub.c index b39bf6b59..022fa46f6 100644 --- a/src/otvalid/otvgsub.c +++ b/src/otvalid/otvgsub.c @@ -4,7 +4,7 @@ /* */ /* OpenType GSUB table validation (body). */ /* */ -/* Copyright 2004 by */ +/* Copyright 2004, 2005 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -567,7 +567,7 @@ LookupList = FT_NEXT_USHORT( p ); valid->type_count = 8; - valid->type_funcs = (OTV_Validate_Func*) otv_gsub_validate_funcs; + valid->type_funcs = (OTV_Validate_Func*)otv_gsub_validate_funcs; valid->glyph_count = glyph_count; otv_LookupList_validate( table + LookupList,