rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation with g++ 4.1 (with both `single' and `multi' 

targets).

* src/base/ftobjs.c (FT_Open_Face): Don't define a variable in block
which is crossed by a `goto'.

* src/otvalid/otvalid.h (otv_MATH_validate): Add prototype.
This commit is contained in:
Werner Lemberg 2008-04-01 06:07:37 +00:00
parent 210d61894b
commit c32e83f23f
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-04-01 Werner Lemberg <wl@gnu.org>
Fix compilation with g++ 4.1 (with both `single' and `multi'
targets).
* src/base/ftobjs.c (FT_Open_Face): Don't define a variable in block
which is crossed by a `goto'.
* src/otvalid/otvalid.h (otv_MATH_validate): Add prototype.
2008-03-31 Werner Lemberg <wl@gnu.org>
Fix support for subsetted CID-keyed CFFs.

8
src/base/ftobjs.c
View File

@ -4,7 +4,7 @@
/* */
/* The FreeType private base classes (body). */
/* */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -1703,6 +1703,8 @@
FT_Face face = 0;
FT_ListNode node = 0;
FT_Bool external_stream;
FT_Module* cur;
FT_Module* limit;
/* test for valid `library' delayed to */
@ -1754,8 +1756,8 @@
else
{
/* check each font driver for an appropriate format */
FT_Module* cur = library->modules;
FT_Module* limit = cur + library->num_modules;
cur = library->modules;
limit = cur + library->num_modules;
for ( ; cur < limit; cur++ )

7
src/otvalid/otvalid.h
View File

@ -4,7 +4,7 @@
/* */
/* OpenType table validation (specification only). */
/* */
/* Copyright 2004 by */
/* Copyright 2004, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -63,6 +63,11 @@ FT_BEGIN_HEADER
FT_UInt glyph_count,
FT_Validator valid );
FT_LOCAL( void )
otv_MATH_validate( FT_Bytes table,
FT_UInt glyph_count,
FT_Validator ftvalid );
FT_END_HEADER