Commit 35fd84b96a776f9e2aa1972dc07d650603e2a6d2
2005-03-08T06:00:35
Formatting.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131
diff --git a/ChangeLog b/ChangeLog
index c1c95ce..c5e793f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
2005-03-06 David Turner <david@freetype.org>
- * 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 <wl@gnu.org>
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 697f8e7..63eeda1 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
/* */
/* <Description> */
/* 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. */
/* */
/* <Input> */
/* face :: A handle to the source face object. */
/* */
/* <Return> */
- /* A pointer to the face's Postscript name. NULL if un-available. */
+ /* A pointer to the face's Postscript name. NULL if unavailable. */
/* */
/* <Note> */
/* 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 574ab7d..c6fc17f 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 3791d54..ceffd2f 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 b39bf6b..022fa46 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,