Commit c11aeb647c6a54cadb705339791111e69250e5e9
2005-03-10T15:49:45
* src/truetype/ttpload.c (tt_face_load_cvt, tt_face_load_fpgm): Fix serious typo which prevented correct TT rendering. * include/freetype/internal/ftmemory.h: Undo change from 2005-03-03. To suppress warnings it is sufficient to use `-fno-strict-aliasing'.
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 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152
diff --git a/ChangeLog b/ChangeLog
index 279059a..707c1ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2005-03-10 Werner Lemberg <wl@gnu.org>
+ * src/truetype/ttpload.c (tt_face_load_cvt, tt_face_load_fpgm):
+ Fix serious typo which prevented correct TT rendering.
+
+ * include/freetype/internal/ftmemory.h: Undo change from 2005-03-03.
+ To suppress warnings it is sufficient to use `-fno-strict-aliasing'.
+
+2005-03-10 Werner Lemberg <wl@gnu.org>
+
* src/tools/glnames.py: Formatted.
Format output to be in sync with other FreeType code.
Import `re' and `os.path'.
@@ -5986,7 +5994,7 @@
the use of system-wide zlib.
Note that this macro, as well as
- FT_CONFIG_OPTION_BYTECODE_INTERPRETER, is not #undef-ed anymore.
+ TT_CONFIG_OPTION_BYTECODE_INTERPRETER, is not #undef-ed anymore.
This allows the build system to define them depending on the
configuration (typically by adding -D flags at compile time).
diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h
index f0df054..ddd0cca 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/include/freetype/internal/ftmemory.h
@@ -368,59 +368,6 @@ FT_BEGIN_HEADER
/* if an error occured (i.e. if 'error != 0'). */
/* */
-
- /*
- * gcc 3.3 and newer will generate tons of _stupid_ warnings if we
- * don't take special measures.
- */
-#if defined ( __GNUC__ ) && \
- ( __GNUC__ > 3 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 3 ) )
-
-
-#define FT_ALLOC( _pointer_, _size_ ) \
- ({ \
- void* _tmp_ = NULL; \
- \
- \
- error = FT_MEM_ALLOC( _tmp_, _size_ ); \
- _pointer_ = _tmp_; \
- error != 0; \
- })
-
-#define FT_REALLOC( _pointer_, _cursize_, _newsize_ ) \
- ({ \
- void* _tmp_ = _pointer_; \
- \
- \
- error = FT_MEM_REALLOC( _tmp_, _cursize_, _newsize_ ); \
- _pointer_ = _tmp_; \
- error != 0; \
- })
-
-#define FT_QALLOC( _pointer_, _size_ ) \
- ({ \
- void* _tmp_; \
- \
- \
- error = FT_MEM_QALLOC( _tmp_, _size_ ); \
- _pointer_ = _tmp_; \
- error != 0; \
- })
-
-#define FT_QREALLOC( _pointer_, _cursize_, _newsize_ ) \
- ({ \
- void* _tmp_ = _pointer_; \
- \
- \
- error = FT_MEM_QREALLOC( _tmp_, _cursize_, _newsize_ ); \
- _pointer_ = _tmp_; \
- error != 0; \
- })
-
-
-#else /* !GCC || GCC < 3.3 */
-
-
#define FT_ALLOC( _pointer_, _size_ ) \
FT_SET_ERROR( FT_MEM_ALLOC( _pointer_, _size_ ) )
@@ -433,8 +380,6 @@ FT_BEGIN_HEADER
#define FT_QREALLOC( _pointer_, _current_, _size_ ) \
FT_SET_ERROR( FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) )
-#endif /* !GCC || GCC < 3.3 */
-
#define FT_FREE( _pointer_ ) \
FT_MEM_FREE( _pointer_ )
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c
index de1f52b..ee7479a 100644
--- a/src/truetype/ttpload.c
+++ b/src/truetype/ttpload.c
@@ -301,7 +301,7 @@
tt_face_load_cvt( TT_Face face,
FT_Stream stream )
{
-#ifdef FT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
FT_Error error;
FT_Memory memory = stream->memory;
@@ -350,12 +350,12 @@
Exit:
return error;
-#else /* !FT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+#else /* !TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
FT_UNUSED( face );
FT_UNUSED( stream );
- return 0;
+ return TT_Err_Ok;
#endif
}
@@ -382,7 +382,7 @@
tt_face_load_fpgm( TT_Face face,
FT_Stream stream )
{
-#ifdef FT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
FT_Error error;
FT_ULong table_len;
@@ -431,12 +431,12 @@
Exit:
return error;
-#else /* !FT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+#else /* !TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
FT_UNUSED( face );
FT_UNUSED( stream );
- return 0;
+ return TT_Err_Ok;
#endif
}