summaryrefslogtreecommitdiff
path: root/src/truetype
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2005-03-10 15:49:45 +0000
committerWerner Lemberg <wl@gnu.org>2005-03-10 15:49:45 +0000
commit3ea9ff3344da81e00f6ff3b25d2c654bc28e3ff4 (patch)
tree169dce80de748fa7fa97b8f36731b467471e4792 /src/truetype
parentb6ca8399977373d6c3ae1404f0d325cfa1db6fe0 (diff)
downloadfreetype2-3ea9ff3344da81e00f6ff3b25d2c654bc28e3ff4.tar.gz
* 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'.
Diffstat (limited to 'src/truetype')
-rw-r--r--src/truetype/ttpload.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c
index de1f52bca..ee7479a1e 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
}