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

Formatting.

This commit is contained in:
Werner Lemberg 2008-08-19 04:53:02 +00:00
parent fdc2d7618a
commit 77f7358533
4 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,25 +1,24 @@
2008-08-18 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2008-08-18 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* src/base/ftmac.c: Add a fallback to suppose the availability * src/base/ftmac.c: Add a fallback to guess the availability of the
of ResourceIndex type. It is used when built without configure `ResourceIndex' type. It is used when built without configure
(e.g. build by Jam). (e.g., a build with Jam).
* builds/mac/ftmac.c: Ditto. * builds/mac/ftmac.c: Ditto.
* builds/unix/configure.raw: Set HAVE_TYPE_RESOURCE_INDEX * builds/unix/configure.raw: Set HAVE_TYPE_RESOURCE_INDEX to 1 or 0
to 1 or 0 explicitly, even if ResourceIndex is unavailable. explicitly, even if `ResourceIndex' is unavailable.
2008-08-18 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2008-08-18 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* builds/unix/configure.raw: In checking of Mac OS X features, * builds/unix/configure.raw: In checking of Mac OS X features,
all-in-one header file "Carbon.h" is replaced by by the minimum all-in-one header file `Carbon.h' is replaced by the minimum
header file "CoreServices.h", as current src/base/ftmac.c. header file `CoreServices.h', similar to current src/base/ftmac.c.
2008-08-18 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2008-08-18 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* src/sfnt/ttcmap.c (tt_cmap2_validate): Skip the validation of * src/sfnt/ttcmap.c (tt_cmap2_validate): Skip the validation of
sub-header when its code_count is 0. Many Japanese Dynalab fonts sub-header when its code_count is 0. Many Japanese Dynalab fonts
include such empty sub-header (code_count == 0, first_code == 0 include such an empty sub-header (code_count == 0, first_code == 0
delta == 0, but offset != 0 ) as the second sub-header in SJIS delta == 0, but offset != 0) as the second sub-header in SJIS cmap.
cmap.
2008-08-04 Werner Lemberg <wl@gnu.org> 2008-08-04 Werner Lemberg <wl@gnu.org>

14
builds/mac/ftmac.c
View File

@ -145,18 +145,18 @@
#endif #endif
#endif #endif
/* configure checks the availability of ResourceIndex strictly */ /* `configure' checks the availability of `ResourceIndex' strictly */
/* and set HAVE_TYPE_RESOURCE_INDEX 1 or 0 always. If it is */ /* and sets HAVE_TYPE_RESOURCE_INDEX to 1 or 0 always. If it is */
/* not set (e.g. build without configure), the availability */ /* not set (e.g., a build without `configure'), the availability */
/* is supposed from the SDK version but this is uncertain. */ /* is guessed from the SDK version. */
#if !defined( HAVE_TYPE_RESOURCE_INDEX ) #ifndef HAVE_TYPE_RESOURCE_INDEX
#if !defined( MAC_OS_X_VERSION_10_5 ) || \ #if !defined( MAC_OS_X_VERSION_10_5 ) || \
# ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 ) ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 )
#define HAVE_TYPE_RESOURCE_INDEX 0 #define HAVE_TYPE_RESOURCE_INDEX 0
#else #else
#define HAVE_TYPE_RESOURCE_INDEX 1 #define HAVE_TYPE_RESOURCE_INDEX 1
#endif #endif
#endif #endif /* !HAVE_TYPE_RESOURCE_INDEX */
#if ( HAVE_TYPE_RESOURCE_INDEX == 0 ) #if ( HAVE_TYPE_RESOURCE_INDEX == 0 )
typedef short ResourceIndex; typedef short ResourceIndex;

16
src/base/ftmac.c
View File

@ -77,21 +77,21 @@
#define OS_INLINE static __inline__ #define OS_INLINE static __inline__
#endif #endif
/* configure checks the availability of ResourceIndex strictly */ /* `configure' checks the availability of `ResourceIndex' strictly */
/* and set HAVE_TYPE_RESOURCE_INDEX 1 or 0 always. If it is */ /* and sets HAVE_TYPE_RESOURCE_INDEX 1 or 0 always. If it is */
/* not set (e.g. build without configure), the availability */ /* not set (e.g., a build without `configure'), the availability */
/* is supposed from the SDK version but this is uncertain. */ /* is guessed from the SDK version. */
#if !defined( HAVE_TYPE_RESOURCE_INDEX ) #ifndef HAVE_TYPE_RESOURCE_INDEX
#if !defined( MAC_OS_X_VERSION_10_5 ) || \ #if !defined( MAC_OS_X_VERSION_10_5 ) || \
# ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 ) ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 )
#define HAVE_TYPE_RESOURCE_INDEX 0 #define HAVE_TYPE_RESOURCE_INDEX 0
#else #else
#define HAVE_TYPE_RESOURCE_INDEX 1 #define HAVE_TYPE_RESOURCE_INDEX 1
#endif #endif
#endif #endif /* !HAVE_TYPE_RESOURCE_INDEX */
#if ( HAVE_TYPE_RESOURCE_INDEX == 0 ) #if ( HAVE_TYPE_RESOURCE_INDEX == 0 )
typedef short ResourceIndex; typedef short ResourceIndex;
#endif #endif
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>

4
src/sfnt/ttcmap.c
View File

@ -328,8 +328,8 @@
delta = TT_NEXT_SHORT( p ); delta = TT_NEXT_SHORT( p );
offset = TT_NEXT_USHORT( p ); offset = TT_NEXT_USHORT( p );
/* many Dynalab fonts have empty sub-header */ /* many Dynalab fonts have empty sub-headers */
if ( 0 == code_count ) if ( code_count == 0 )
continue; continue;
/* check range within 0..255 */ /* check range within 0..255 */