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

formatting

This commit is contained in:
Werner Lemberg 2006-12-16 02:57:46 +00:00
parent 1d5b6a6054
commit 0fd08bdc6a
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,9 +1,8 @@
2006-12-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2006-12-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* include/freetype/internal/services/svotval.h: Add `volatile' to * include/freetype/internal/services/svotval.h: Add `volatile' to
sync with the modification by Jens Claudius on 2006-08-22. sync with the modification by Jens Claudius on 2006-08-22; cf.
http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/ http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/otvalid/otvmod.c?r1=1.4&r2=1.5
/otvalid/otvmod.c?r1=1.4&r2=1.5
2006-12-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2006-12-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
@ -25,8 +24,9 @@
2006-12-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2006-12-15 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* src/base/ftobjs.c: Improvement of resource fork handler for POSIX, * src/base/ftobjs.c: Improvement of resource fork handler for
http://lists.gnu.org/archive/html/freetype-devel/2006-10/msg00025.html POSIX, cf.
http://lists.gnu.org/archive/html/freetype-devel/2006-10/msg00025.html
(Mac_Read_sfnt_Resource): Count only `sfnt' resource of suitcase font (Mac_Read_sfnt_Resource): Count only `sfnt' resource of suitcase font
format or .dfont, to simulate the face index number counted by ftmac.c. format or .dfont, to simulate the face index number counted by ftmac.c.
(IsMacResource): Return the number of scalable faces correctly. (IsMacResource): Return the number of scalable faces correctly.

4
builds/unix/configure.raw
View File

@ -441,8 +441,8 @@ case "$CFLAGS" in
*HAVE_FSSPEC* | *HAVE_FSREF* | *HAVE_QUICKDRAW* | *HAVE_ATS* ) *HAVE_FSSPEC* | *HAVE_FSREF* | *HAVE_QUICKDRAW* | *HAVE_ATS* )
AC_MSG_WARN([ AC_MSG_WARN([
*** WARNING *** WARNING
FSSpec/FSRef/QuickDraw/ATS options are explicitly given. FSSpec/FSRef/QuickDraw/ATS options are explicitly given,
use legacy builds/mac/ftmac.c instead of src/base/ftmac.c thus using legacy builds/mac/ftmac.c instead of src/base/ftmac.c.
]) ])
CFLAGS="$CFLAGS "'-I$(TOP_DIR)/builds/mac/' CFLAGS="$CFLAGS "'-I$(TOP_DIR)/builds/mac/'
;; ;;

12
include/freetype/internal/services/svotval.h
View File

@ -30,12 +30,12 @@ FT_BEGIN_HEADER
typedef FT_Error typedef FT_Error
(*otv_validate_func)( FT_Face volatile face, (*otv_validate_func)( FT_Face volatile face,
FT_UInt ot_flags, FT_UInt ot_flags,
FT_Bytes *base, FT_Bytes *base,
FT_Bytes *gdef, FT_Bytes *gdef,
FT_Bytes *gpos, FT_Bytes *gpos,
FT_Bytes *gsub, FT_Bytes *gsub,
FT_Bytes *jstf ); FT_Bytes *jstf );
FT_DEFINE_SERVICE( OTvalidate ) FT_DEFINE_SERVICE( OTvalidate )

5
src/base/ftmac.c
View File

@ -3,8 +3,9 @@
/* ftmac.c */ /* ftmac.c */
/* */ /* */
/* Mac FOND support. Written by just@letterror.com. */ /* Mac FOND support. Written by just@letterror.com. */
/* Heavily Fixed by mpsuzuki, George Williams and Sean McBride */ /* Heavily modified by mpsuzuki, George Williams, and Sean McBride. */
/* This file is for Mac OS X only, see builds/mac/ftoldmac.c for */ /* */
/* This file is for Mac OS X only; see builds/mac/ftoldmac.c for */
/* classic platforms built by MPW. */ /* classic platforms built by MPW. */
/* */ /* */
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */ /* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */

4
src/base/ftobjs.c
View File

@ -1445,7 +1445,7 @@
error = Mac_Read_POST_Resource( library, stream, data_offsets, count, error = Mac_Read_POST_Resource( library, stream, data_offsets, count,
face_index, aface ); face_index, aface );
FT_FREE( data_offsets ); FT_FREE( data_offsets );
/* POST exists in a LWFN providing single face */ /* POST exists in an LWFN providing a single face */
(*aface)->num_faces = 1; (*aface)->num_faces = 1;
return error; return error;
} }
@ -1456,7 +1456,7 @@
&data_offsets, &count ); &data_offsets, &count );
if ( !error ) if ( !error )
{ {
FT_Long face_index_internal = face_index % count; FT_Long face_index_internal = face_index % count;
error = Mac_Read_sfnt_Resource( library, stream, data_offsets, count, error = Mac_Read_sfnt_Resource( library, stream, data_offsets, count,