From 645f60b8695177376d60f9dacd681914ad34cf93 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 8 Jun 2001 21:17:29 +0000 Subject: [PATCH] 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. --- ChangeLog | 16 ++++++++++++---- builds/unix/configure | 2 +- builds/unix/configure.ac | 2 +- include/freetype/fttypes.h | 5 +++-- src/base/ftobjs.c | 5 +++-- src/base/ftoutln.c | 2 +- src/truetype/ttinterp.c | 2 +- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3109fe860..e9bc2b25b 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 @@ -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 diff --git a/builds/unix/configure b/builds/unix/configure index f99ce518f..a135cd033 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 508864a12..6de58aa62 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 ece9e4ffd..6444e7294 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 df11f1c4d..11215bf04 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 42268caed..342ee28a7 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 05440d5c3..1f5b6c79f 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 ) {