From bcf8d4b497b691294c9f3975af66940bbecb1907 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 24 Aug 2001 23:11:34 +0000 Subject: [PATCH] * src/sfnt/ttload.c (TT_Load_CMap): Fix frame length of `cmap_rec_fields'. * include/freetype/fterrors.h [!FT_CONFIG_OPTION_USE_MODULE_ERRORS]: Undefine FT_ERR_BASE before defining again. --- ChangeLog | 8 ++++++++ include/freetype/freetype.h | 16 ++++++++-------- include/freetype/fterrors.h | 1 + src/sfnt/ttload.c | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0f2c6f2a..ddad7fe47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-08-25 Werner Lemberg + + * src/sfnt/ttload.c (TT_Load_CMap): Fix frame length of + `cmap_rec_fields'. + + * include/freetype/fterrors.h [!FT_CONFIG_OPTION_USE_MODULE_ERRORS]: + Undefine FT_ERR_BASE before defining again. + 2001-08-22 Werner Lemberg * src/truetype/ttinterp.h: Fix prototype of TT_Move_Func. diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index eebe71caa..2524f8b64 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -539,12 +539,12 @@ FT_BEGIN_HEADER /* num_charmaps :: The total number of character maps in the */ /* face. */ /* */ - /* charmaps :: A table of pointers to the face's charmaps */ + /* charmaps :: A table of pointers to the face's charmaps. */ /* Used to scan the list of available charmaps */ - /* this table might change after a call to */ - /* FT_Attach_File/Stream (e.g. when it used */ - /* to hook and additional encoding/CMap to */ - /* the face object). */ + /* -- this table might change after a call to */ + /* FT_Attach_File/Stream (e.g. when used to */ + /* hook an additional encoding/CMap to the */ + /* face object). */ /* */ /* generic :: A field reserved for client uses. See the */ /* FT_Generic type description. */ @@ -1512,7 +1512,7 @@ FT_BEGIN_HEADER /* format of a given font resource. If the `face_index' field is */ /* negative, the function will _not_ return any face handle in */ /* `aface'. Its return value should be 0 if the font format is */ - /* recognized, or non-zero if not. */ + /* recognized, or non-zero otherwise. */ /* */ FT_EXPORT( FT_Error ) FT_New_Face( FT_Library library, @@ -1560,7 +1560,7 @@ FT_BEGIN_HEADER /* font format of a given font resource. If the `face_index' field */ /* is negative, the function will _not_ return any face handle in */ /* `aface'. Its return value should be 0 if the font format is */ - /* recognized, or non-zero if not. */ + /* recognized, or non-zero otherwise. */ /* */ FT_EXPORT( FT_Error ) FT_New_Memory_Face( FT_Library library, @@ -1604,7 +1604,7 @@ FT_BEGIN_HEADER /* format of a given font resource. If the `face_index' field is */ /* negative, the function will _not_ return any face handle in */ /* `*face'. Its return value should be 0 if the font format is */ - /* recognized, or non-zero if not. */ + /* recognized, or non-zero otherwise. */ /* */ FT_EXPORT( FT_Error ) FT_Open_Face( FT_Library library, diff --git a/include/freetype/fterrors.h b/include/freetype/fterrors.h index 85183749c..89e0cf32a 100644 --- a/include/freetype/fterrors.h +++ b/include/freetype/fterrors.h @@ -127,6 +127,7 @@ #else +#undef FT_ERR_BASE #define FT_ERR_BASE 0 #endif /* FT_CONFIG_OPTION_USE_MODULE_ERRORS */ diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index 69466369f..0c9a178e9 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -1141,7 +1141,7 @@ #undef FT_STRUCTURE #define FT_STRUCTURE TT_CMapTable - FT_FRAME_START( 6 ), + FT_FRAME_START( 4 ), FT_FRAME_USHORT( format ), FT_FRAME_USHORT( length ), FT_FRAME_END