Commit 6a4253388bee1f9be9ab6787a74b2217f1869712
2000-10-24T05:44:59
fixes for fixes :-) formatting; compiles now without warnings on my Linux box
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
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index e84441e..32191bb 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -1149,9 +1149,11 @@
void* other;
- /*@private begin*/
+ /*@private begin */
+
FT_GlyphLoader* loader;
- /*@private end*/
+
+ /*@private end */
} FT_GlyphSlotRec;
diff --git a/include/freetype/fterrors.h b/include/freetype/fterrors.h
index 950bb7a..036899b 100644
--- a/include/freetype/fterrors.h
+++ b/include/freetype/fterrors.h
@@ -172,7 +172,7 @@
"negative height while rastering" )
/* cache errors */
-
+
FT_ERRORDEF( FT_Err_Too_Many_Caches, 0x0070, \
"too many registered caches" )
diff --git a/include/freetype/ftnames.h b/include/freetype/ftnames.h
index ce3bf49..c29f9d8 100644
--- a/include/freetype/ftnames.h
+++ b/include/freetype/ftnames.h
@@ -65,10 +65,10 @@
FT_UShort encoding_id;
FT_UShort language_id;
FT_UShort name_id;
-
+
FT_Byte* string; /* this string is *not* null-terminated! */
FT_UInt string_len; /* in bytes */
-
+
} FT_SfntName;
@@ -119,7 +119,7 @@
FT_EXPORT_DEF( FT_Error ) FT_Get_Sfnt_Name( FT_Face face,
FT_UInt index,
FT_SfntName* aname );
-
+
#ifdef __cplusplus
}
diff --git a/src/base/ftinit.c b/src/base/ftinit.c
index b5a4abe..5b56b8c 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -66,7 +66,7 @@
static
const FT_Module_Class* const ft_default_modules[] =
-const {
+ {
#include <freetype/config/ftmodule.h>
0
};
@@ -87,8 +87,8 @@ const {
/* */
FT_EXPORT_FUNC( void ) FT_Add_Default_Modules( FT_Library library )
{
- FT_Error error;
- const FT_Module_Class** cur;
+ FT_Error error;
+ const FT_Module_Class* const* cur;
/* test for valid `library' delayed to FT_Add_Module() */
diff --git a/src/raster1/ftraster.c b/src/raster1/ftraster.c
index 3db811b..0be0f37 100644
--- a/src/raster1/ftraster.c
+++ b/src/raster1/ftraster.c
@@ -2971,8 +2971,6 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- /* XXX Fixme: ftraster's error codes don't harmonize with FT2's ones! */
- /* */
LOCAL_FUNC
FT_Error Render_Glyph( RAS_ARG )
{