Commit 79860707146ac0d9ae0a9656d85fb9bfd4540b1e
2001-06-08T21:17:29
Increase `version_info' to 7:0:1. Fixed a bug that returned an invalid linear width for composite TrueType glyphs. * include/internal/tttypes.h (TT_Loader_): Two new elements `linear' and `linear_def'. * src/truetype/ttgload.c (load_truetype_glyph, compute_glyph_metrics): Use it. * include/fttypes.h (FT_ERROR_BASE): New macro. * src/base/ftobjs.c (FT_Open_Face, FT_Render_Glyph_Internal): Use it to make source code work with the new error scheme implemented by Werner. * src/base/ftoutln.c (FT_Outline_Render): Ditto.
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
diff --git a/ChangeLog b/ChangeLog
index 3109fe8..e9bc2b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
* builds/unix/configure.ac: This to make sure that autoconf 2.50 is
needed.
Run `autoupdate' on it.
+ Increase `version_info' to 7:0:1.
* builds/unix/configure: Regenerated.
2001-06-08 David Turner <david@freetype.org>
@@ -12,12 +13,19 @@
corrupted transformed glyphs that were auto-hinted (the transform
was applied twice).
- * include/internal/tttypes.h, src/truetype/ttgload.c: fixed a bug
- that returned an invalid linear width for composite TrueType glyphs
+ Fixed a bug that returned an invalid linear width for composite
+ TrueType glyphs.
- * include/fttypes.h, src/base/ftobjs.c: fixed source code to work
- with the new error scheme implemented by Werner
+ * include/internal/tttypes.h (TT_Loader_): Two new elements `linear'
+ and `linear_def'.
+ * src/truetype/ttgload.c (load_truetype_glyph,
+ compute_glyph_metrics): Use it.
+ * include/fttypes.h (FT_ERROR_BASE): New macro.
+ * src/base/ftobjs.c (FT_Open_Face, FT_Render_Glyph_Internal): Use it
+ to make source code work with the new error scheme implemented by
+ Werner.
+ * src/base/ftoutln.c (FT_Outline_Render): Ditto.
2001-06-07 Werner Lemberg <wl@gnu.org>
diff --git a/builds/unix/configure b/builds/unix/configure
index f99ce51..a135cd0 100644
--- a/builds/unix/configure
+++ b/builds/unix/configure
@@ -1098,7 +1098,7 @@ rm -f conftest.sh
ac_config_headers="$ac_config_headers ftconfig.h:ftconfig.in"
-version_info='6:1:0'
+version_info='7:0:1'
ft_version=`echo $version_info | tr : .`
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
index 508864a..6de58aa 100644
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -9,7 +9,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
dnl configuration file -- stay in 8.3 limit
AC_CONFIG_HEADER(ftconfig.h:ftconfig.in)
-version_info='6:1:0'
+version_info='7:0:1'
AC_SUBST(version_info)
ft_version=`echo $version_info | tr : .`
AC_SUBST(ft_version)
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index ece9e4f..6444e72 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -509,8 +509,9 @@ FT_BEGIN_HEADER
#define FT_IS_EMPTY( list ) ( (list).head == 0 )
-/* return base error code (without module-specific prefix) */
-#define FT_ERROR_BASE(x) ((x) & 255)
+ /* return base error code (without module-specific prefix) */
+#define FT_ERROR_BASE( x ) ( (x) & 255 )
+
FT_END_HEADER
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index df11f1c..11215bf 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1240,7 +1240,7 @@
if ( !error )
goto Success;
- if ( FT_ERROR_BASE(error) != FT_Err_Unknown_File_Format )
+ if ( FT_ERROR_BASE( error ) != FT_Err_Unknown_File_Format )
goto Fail2;
}
}
@@ -2115,7 +2115,8 @@
while ( renderer )
{
error = renderer->render( renderer, slot, render_mode, 0 );
- if ( !error || FT_ERROR_BASE(error) != FT_Err_Cannot_Render_Glyph )
+ if ( !error ||
+ FT_ERROR_BASE( error ) != FT_Err_Cannot_Render_Glyph )
break;
/* FT_Err_Cannot_Render_Glyph is returned if the render mode */
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index 42268ca..342ee28 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -514,7 +514,7 @@
while ( renderer )
{
error = renderer->raster_render( renderer->raster, params );
- if ( !error || FT_ERROR_BASE(error) != FT_Err_Cannot_Render_Glyph )
+ if ( !error || FT_ERROR_BASE( error ) != FT_Err_Cannot_Render_Glyph )
break;
/* FT_Err_Cannot_Render_Glyph is returned if the render mode */
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 05440d5..1f5b6c7 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -7390,7 +7390,7 @@
#endif /* TT_CONFIG_OPTION_INTERPRETER_SWITCH */
- if ( CUR.error != FT_Err_Ok )
+ if ( CUR.error != TT_Err_Ok )
{
switch ( CUR.error )
{