minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

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.
This commit is contained in:
Werner Lemberg 2001-06-08 21:17:29 +00:00
parent 1ad51db6b1
commit 645f60b869
7 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -4,6 +4,7 @@
* builds/unix/configure.ac: This to make sure that autoconf 2.50 is * builds/unix/configure.ac: This to make sure that autoconf 2.50 is
needed. needed.
Run `autoupdate' on it. Run `autoupdate' on it.
Increase `version_info' to 7:0:1.
* builds/unix/configure: Regenerated. * builds/unix/configure: Regenerated.
2001-06-08 David Turner <david@freetype.org> 2001-06-08 David Turner <david@freetype.org>
@ -12,12 +13,19 @@
corrupted transformed glyphs that were auto-hinted (the transform corrupted transformed glyphs that were auto-hinted (the transform
was applied twice). was applied twice).
* include/internal/tttypes.h, src/truetype/ttgload.c: fixed a bug Fixed a bug that returned an invalid linear width for composite
that returned an invalid linear width for composite TrueType glyphs TrueType glyphs.
* include/fttypes.h, src/base/ftobjs.c: fixed source code to work * include/internal/tttypes.h (TT_Loader_): Two new elements `linear'
with the new error scheme implemented by Werner 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> 2001-06-07 Werner Lemberg <wl@gnu.org>

2
builds/unix/configure vendored
View File

@ -1098,7 +1098,7 @@ rm -f conftest.sh
ac_config_headers="$ac_config_headers ftconfig.h:ftconfig.in" 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 : .` ft_version=`echo $version_info | tr : .`

2
builds/unix/configure.ac
View File

@ -9,7 +9,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])
dnl configuration file -- stay in 8.3 limit dnl configuration file -- stay in 8.3 limit
AC_CONFIG_HEADER(ftconfig.h:ftconfig.in) AC_CONFIG_HEADER(ftconfig.h:ftconfig.in)
version_info='6:1:0' version_info='7:0:1'
AC_SUBST(version_info) AC_SUBST(version_info)
ft_version=`echo $version_info | tr : .` ft_version=`echo $version_info | tr : .`
AC_SUBST(ft_version) AC_SUBST(ft_version)

5
include/freetype/fttypes.h
View File

@ -509,8 +509,9 @@ FT_BEGIN_HEADER
#define FT_IS_EMPTY( list ) ( (list).head == 0 ) #define FT_IS_EMPTY( list ) ( (list).head == 0 )
/* return base error code (without module-specific prefix) */ /* return base error code (without module-specific prefix) */
#define FT_ERROR_BASE(x) ((x) & 255) #define FT_ERROR_BASE( x ) ( (x) & 255 )
FT_END_HEADER FT_END_HEADER

5
src/base/ftobjs.c
View File

@ -1240,7 +1240,7 @@
if ( !error ) if ( !error )
goto Success; goto Success;
if ( FT_ERROR_BASE(error) != FT_Err_Unknown_File_Format ) if ( FT_ERROR_BASE( error ) != FT_Err_Unknown_File_Format )
goto Fail2; goto Fail2;
} }
} }
@ -2115,7 +2115,8 @@
while ( renderer ) while ( renderer )
{ {
error = renderer->render( renderer, slot, render_mode, 0 ); 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; break;
/* FT_Err_Cannot_Render_Glyph is returned if the render mode */ /* FT_Err_Cannot_Render_Glyph is returned if the render mode */

2
src/base/ftoutln.c
View File

@ -514,7 +514,7 @@
while ( renderer ) while ( renderer )
{ {
error = renderer->raster_render( renderer->raster, params ); 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; break;
/* FT_Err_Cannot_Render_Glyph is returned if the render mode */ /* FT_Err_Cannot_Render_Glyph is returned if the render mode */

2
src/truetype/ttinterp.c
View File

@ -7390,7 +7390,7 @@
#endif /* TT_CONFIG_OPTION_INTERPRETER_SWITCH */ #endif /* TT_CONFIG_OPTION_INTERPRETER_SWITCH */
if ( CUR.error != FT_Err_Ok ) if ( CUR.error != TT_Err_Ok )
{ {
switch ( CUR.error ) switch ( CUR.error )
{ {