From f5a286efe266f18dd107eb01d2800ad98da7bb69 Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Thu, 24 Jul 2003 18:46:44 +0000 Subject: [PATCH] Upgrade to 2.1.4 git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4057 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../libs/freetype2/freetype/cache/ftccache.h | 2 +- .../libs/freetype2/freetype/cache/ftccmap.h | 2 +- .../libs/freetype2/freetype/cache/ftcglyph.h | 2 +- .../libs/freetype2/freetype/cache/ftcimage.h | 2 +- .../libs/freetype2/freetype/cache/ftcmanag.h | 2 +- .../libs/freetype2/freetype/cache/ftcsbits.h | 2 +- headers/libs/freetype2/freetype/cache/ftlru.h | 2 +- .../libs/freetype2/freetype/config/ftconfig.h | 2 +- .../libs/freetype2/freetype/config/ftheader.h | 13 +- .../libs/freetype2/freetype/config/ftmodule.h | 2 +- .../libs/freetype2/freetype/config/ftoption.h | 21 +- .../libs/freetype2/freetype/config/ftstdlib.h | 2 +- headers/libs/freetype2/freetype/freetype.h | 30 ++- headers/libs/freetype2/freetype/ftbbox.h | 2 +- headers/libs/freetype2/freetype/ftbdf.h | 100 ++++++- headers/libs/freetype2/freetype/ftcache.h | 2 +- headers/libs/freetype2/freetype/ftchapters.h | 2 +- headers/libs/freetype2/freetype/fterrdef.h | 245 ++++++------------ headers/libs/freetype2/freetype/fterrors.h | 8 +- headers/libs/freetype2/freetype/ftglyph.h | 4 +- headers/libs/freetype2/freetype/ftgzip.h | 6 +- headers/libs/freetype2/freetype/ftimage.h | 2 +- headers/libs/freetype2/freetype/ftincrem.h | 21 +- headers/libs/freetype2/freetype/ftlist.h | 2 +- headers/libs/freetype2/freetype/ftmac.h | 2 +- headers/libs/freetype2/freetype/ftmm.h | 2 +- headers/libs/freetype2/freetype/ftmoderr.h | 2 +- headers/libs/freetype2/freetype/ftmodule.h | 2 +- headers/libs/freetype2/freetype/ftoutln.h | 2 +- headers/libs/freetype2/freetype/ftpfr.h | 2 +- headers/libs/freetype2/freetype/ftrender.h | 2 +- headers/libs/freetype2/freetype/ftsizes.h | 2 +- headers/libs/freetype2/freetype/ftsnames.h | 2 +- headers/libs/freetype2/freetype/ftstroker.h | 2 +- headers/libs/freetype2/freetype/ftsynth.h | 2 +- headers/libs/freetype2/freetype/ftsysio.h | 2 +- headers/libs/freetype2/freetype/ftsysmem.h | 2 +- headers/libs/freetype2/freetype/ftsystem.h | 2 +- headers/libs/freetype2/freetype/fttrigon.h | 2 +- headers/libs/freetype2/freetype/fttypes.h | 2 +- headers/libs/freetype2/freetype/ftxf86.h | 2 +- .../freetype2/freetype/internal/autohint.h | 2 +- .../freetype2/freetype/internal/bdftypes.h | 7 +- .../freetype2/freetype/internal/cfftypes.h | 2 +- .../freetype2/freetype/internal/fnttypes.h | 55 +--- .../libs/freetype2/freetype/internal/ftcalc.h | 2 +- .../libs/freetype2/freetype/internal/ftcore.h | 2 +- .../freetype2/freetype/internal/ftdebug.h | 2 +- .../freetype2/freetype/internal/ftdriver.h | 2 +- .../freetype2/freetype/internal/ftexcept.h | 2 +- .../freetype2/freetype/internal/ftgloadr.h | 2 +- .../libs/freetype2/freetype/internal/fthash.h | 2 +- .../freetype2/freetype/internal/ftmemory.h | 2 +- .../freetype2/freetype/internal/ftobject.h | 2 +- .../libs/freetype2/freetype/internal/ftobjs.h | 37 ++- .../freetype2/freetype/internal/ftstream.h | 2 +- .../freetype2/freetype/internal/fttrace.h | 2 +- .../freetype2/freetype/internal/internal.h | 2 +- .../freetype2/freetype/internal/pcftypes.h | 2 +- .../libs/freetype2/freetype/internal/pfr.h | 2 +- .../libs/freetype2/freetype/internal/psaux.h | 2 +- .../freetype2/freetype/internal/pshints.h | 2 +- .../freetype2/freetype/internal/psnames.h | 2 +- .../libs/freetype2/freetype/internal/sfnt.h | 17 +- .../freetype2/freetype/internal/t1types.h | 2 +- .../freetype2/freetype/internal/t42types.h | 2 +- .../freetype2/freetype/internal/tttypes.h | 2 +- headers/libs/freetype2/freetype/t1tables.h | 2 +- headers/libs/freetype2/freetype/ttnameid.h | 80 +++++- headers/libs/freetype2/freetype/tttables.h | 59 ++++- headers/libs/freetype2/freetype/tttags.h | 2 +- headers/libs/freetype2/ft2build.h | 78 +++--- 72 files changed, 526 insertions(+), 367 deletions(-) diff --git a/headers/libs/freetype2/freetype/cache/ftccache.h b/headers/libs/freetype2/freetype/cache/ftccache.h index 701b13eb0e..f5e91b40dd 100644 --- a/headers/libs/freetype2/freetype/cache/ftccache.h +++ b/headers/libs/freetype2/freetype/cache/ftccache.h @@ -301,4 +301,4 @@ FT_END_HEADER #endif /* __FTCCACHE_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/cache/ftccmap.h b/headers/libs/freetype2/freetype/cache/ftccmap.h index 11f7b03b6d..4016a4fe77 100644 --- a/headers/libs/freetype2/freetype/cache/ftccmap.h +++ b/headers/libs/freetype2/freetype/cache/ftccmap.h @@ -213,4 +213,4 @@ FT_END_HEADER #endif /* __FTCCMAP_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/cache/ftcglyph.h b/headers/libs/freetype2/freetype/cache/ftcglyph.h index 3d14cf0244..afc7290381 100644 --- a/headers/libs/freetype2/freetype/cache/ftcglyph.h +++ b/headers/libs/freetype2/freetype/cache/ftcglyph.h @@ -190,4 +190,4 @@ FT_END_HEADER #endif /* __FTCGLYPH_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/cache/ftcimage.h b/headers/libs/freetype2/freetype/cache/ftcimage.h index 382d991d3a..5e65f1a0dd 100644 --- a/headers/libs/freetype2/freetype/cache/ftcimage.h +++ b/headers/libs/freetype2/freetype/cache/ftcimage.h @@ -309,4 +309,4 @@ FT_END_HEADER #endif /* __FTCIMAGE_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/cache/ftcmanag.h b/headers/libs/freetype2/freetype/cache/ftcmanag.h index 97c77591b8..f7f397c89a 100644 --- a/headers/libs/freetype2/freetype/cache/ftcmanag.h +++ b/headers/libs/freetype2/freetype/cache/ftcmanag.h @@ -241,4 +241,4 @@ FT_END_HEADER #endif /* __FTCMANAG_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/cache/ftcsbits.h b/headers/libs/freetype2/freetype/cache/ftcsbits.h index 6f8ef99cf7..41b5cceea0 100644 --- a/headers/libs/freetype2/freetype/cache/ftcsbits.h +++ b/headers/libs/freetype2/freetype/cache/ftcsbits.h @@ -272,4 +272,4 @@ FT_END_HEADER #endif /* __FTCSBITS_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/cache/ftlru.h b/headers/libs/freetype2/freetype/cache/ftlru.h index 9e4507efa2..5b957488e0 100644 --- a/headers/libs/freetype2/freetype/cache/ftlru.h +++ b/headers/libs/freetype2/freetype/cache/ftlru.h @@ -199,4 +199,4 @@ FT_END_HEADER #endif /* __FTLRU_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/config/ftconfig.h b/headers/libs/freetype2/freetype/config/ftconfig.h index 72bee0cc5f..27f9d7fefb 100644 --- a/headers/libs/freetype2/freetype/config/ftconfig.h +++ b/headers/libs/freetype2/freetype/config/ftconfig.h @@ -331,4 +331,4 @@ FT_END_HEADER #endif /* __FTCONFIG_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/config/ftheader.h b/headers/libs/freetype2/freetype/config/ftheader.h index 3ce1773884..bb18eb5a89 100644 --- a/headers/libs/freetype2/freetype/config/ftheader.h +++ b/headers/libs/freetype2/freetype/config/ftheader.h @@ -373,6 +373,17 @@ #define FT_GZIP_H + /*************************************************************************/ + /* */ + /* @macro: */ + /* FT_WINFONTS_H */ + /* */ + /* @description: */ + /* A macro used in #include statements to name the file containing */ + /* the definitions of an API to support Windows .FNT files */ + /* */ +#define FT_WINFONTS_H + /*************************************************************************/ /* */ /* @macro: */ @@ -521,4 +532,4 @@ #endif /* __FT2_BUILD_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/config/ftmodule.h b/headers/libs/freetype2/freetype/config/ftmodule.h index d0e6f16a3c..3e7d9e6ea5 100644 --- a/headers/libs/freetype2/freetype/config/ftmodule.h +++ b/headers/libs/freetype2/freetype/config/ftmodule.h @@ -16,4 +16,4 @@ FT_USE_MODULE(t1_driver_class) FT_USE_MODULE(t42_driver_class) FT_USE_MODULE(pfr_driver_class) FT_USE_MODULE(winfnt_driver_class) - + diff --git a/headers/libs/freetype2/freetype/config/ftoption.h b/headers/libs/freetype2/freetype/config/ftoption.h index 85c9e45bea..9ce528d9b0 100644 --- a/headers/libs/freetype2/freetype/config/ftoption.h +++ b/headers/libs/freetype2/freetype/config/ftoption.h @@ -469,10 +469,29 @@ FT_BEGIN_HEADER /* */ +/* + * the FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent + * improvements to the auto-hinter contributed by David Chester. They will + * most likely disappear completely in the next release. For now, you should + * always keep them defined + * + */ +#define FT_CONFIG_OPTION_CHESTER_HINTS + +#ifdef FT_CONFIG_OPTION_CHESTER_HINTS + +# define FT_CONFIG_CHESTER_SMALL_F +# define FT_CONFIG_CHESTER_ASCENDER +# define FT_CONFIG_CHESTER_SERIF +# define FT_CONFIG_CHESTER_STEM +# define FT_CONFIG_CHESTER_BLUE_SCALE + +#endif /* FT_CONFIG_OPTION_CHESTER_HINTS */ + FT_END_HEADER #endif /* __FTOPTION_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/config/ftstdlib.h b/headers/libs/freetype2/freetype/config/ftstdlib.h index 6c060912d7..b2bba62c5a 100644 --- a/headers/libs/freetype2/freetype/config/ftstdlib.h +++ b/headers/libs/freetype2/freetype/config/ftstdlib.h @@ -137,4 +137,4 @@ #endif /* __FTSTDLIB_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/freetype.h b/headers/libs/freetype2/freetype/freetype.h index 076086eae4..5ed3a68954 100644 --- a/headers/libs/freetype2/freetype/freetype.h +++ b/headers/libs/freetype2/freetype/freetype.h @@ -35,7 +35,7 @@ /* */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 1 -#define FREETYPE_PATCH 3 +#define FREETYPE_PATCH 4 #include @@ -1105,8 +1105,6 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /* FreeType base size metrics */ - /* */ /* */ /* FT_Size_Metrics */ /* */ @@ -1135,7 +1133,7 @@ FT_BEGIN_HEADER /* pixels. Always positive. */ /* */ /* descender :: The descender, expressed in 26.6 fixed point */ - /* pixels. Always positive. */ + /* pixels. Always negative. */ /* */ /* height :: The text height, expressed in 26.6 fixed point */ /* pixels. Always positive. */ @@ -1494,6 +1492,16 @@ FT_BEGIN_HEADER /* */ /* FT_OPEN_PARAMS :: Use the `num_params' & `params' field. */ /* */ + /* ft_open_memory :: deprecated. use @FT_OPEN_MEMORY instead */ + /* */ + /* ft_open_stream :: deprecated. use @FT_OPEN_STREAM instead */ + /* */ + /* ft_open_pathname :: deprecated. use @FT_OPEN_PATHNAME instead */ + /* */ + /* ft_open_driver :: deprecated, use @FT_OPEN_DRIVER instead */ + /* */ + /* ft_open_params :: deprecated, use @FT_OPEN_PARAMS instead */ + /* */ /* */ /* The `FT_OPEN_MEMORY', `FT_OPEN_STREAM', and `FT_OPEN_PATHNAME' */ /* flags are mutually exclusive. */ @@ -1508,11 +1516,11 @@ FT_BEGIN_HEADER } FT_Open_Flags; -#define FT_OPEN_MEMORY FT_OPEN_MEMORY -#define FT_OPEN_STREAM FT_OPEN_STREAM -#define FT_OPEN_PATHNAME FT_OPEN_PATHNAME -#define FT_OPEN_DRIVER FT_OPEN_DRIVER -#define FT_OPEN_PARAMS FT_OPEN_PARAMS +#define ft_open_memory FT_OPEN_MEMORY /* deprecated */ +#define ft_open_stream FT_OPEN_STREAM /* deprecated */ +#define ft_open_pathname FT_OPEN_PATHNAME /* deprecated */ +#define ft_open_driver FT_OPEN_DRIVER /* deprecated */ +#define ft_open_params FT_OPEN_PARAMS /* deprecated */ /*************************************************************************/ @@ -2151,7 +2159,6 @@ FT_BEGIN_HEADER #define FT_LOAD_TARGET_MONO FT_LOAD_TARGET_( FT_RENDER_MODE_MONO ) #define FT_LOAD_TARGET_LCD FT_LOAD_TARGET_( FT_RENDER_MODE_LCD ) #define FT_LOAD_TARGET_LCD_V FT_LOAD_TARGET_( FT_RENDER_MODE_LCD_V ) -#define FT_LOAD_TARGET_SMOOTH FT_LOAD_TARGET_( FT_RENDER_MODE_SMOOTH ) #define FT_LOAD_DEFAULT 0x0 @@ -2240,7 +2247,6 @@ FT_BEGIN_HEADER FT_RENDER_MODE_MONO, FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V, - FT_RENDER_MODE_SMOOTH, FT_RENDER_MODE_MAX @@ -2857,4 +2863,4 @@ FT_END_HEADER #endif /* __FREETYPE_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftbbox.h b/headers/libs/freetype2/freetype/ftbbox.h index e6616135a2..3afa69fae5 100644 --- a/headers/libs/freetype2/freetype/ftbbox.h +++ b/headers/libs/freetype2/freetype/ftbbox.h @@ -80,4 +80,4 @@ FT_END_HEADER #endif /* __FTBBOX_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftbdf.h b/headers/libs/freetype2/freetype/ftbdf.h index c33f9fc217..da2930665c 100644 --- a/headers/libs/freetype2/freetype/ftbdf.h +++ b/headers/libs/freetype2/freetype/ftbdf.h @@ -43,6 +43,73 @@ FT_BEGIN_HEADER /*************************************************************************/ + /********************************************************************** + * + * @enum: + * FT_PropertyType + * + * @description: + * list of BDF property types + * + * @values: + * BDF_PROPERTY_TYPE_NONE :: + * value 0 is used to indicate a missing property + * + * BDF_PROPERTY_TYPE_ATOM :: + * property is a string atom + * + * BDF_PROPERTY_TYPE_INTEGER :: + * property is a 32-bit signed integer + * + * BDF_PROPERTY_TYPE_CARDINAL :: + * property is a 32-bit unsigned integer + */ + typedef enum + { + BDF_PROPERTY_TYPE_NONE = 0, + BDF_PROPERTY_TYPE_ATOM = 1, + BDF_PROPERTY_TYPE_INTEGER = 2, + BDF_PROPERTY_TYPE_CARDINAL = 3 + + } BDF_PropertyType; + + + /********************************************************************** + * + * @type: BDF_Property + * + * @description: + * handle to a @BDF_PropertyRec structure used to model a given + * BDF/PCF property + */ + typedef struct BDF_PropertyRec_* BDF_Property; + + /********************************************************************** + * + * @struct: BDF_PropertyRec + * + * @description: + * models a given BDF/PCF property + * + * @note: + * type :: property type + * u.atom :: atom string, when type is @BDF_PROPERTY_TYPE_ATOM + * u.integer :: signed integer, when type is @BDF_PROPERTY_TYPE_INTEGER + * u.cardinal :: unsigned integer, when type is @BDF_PROPERTY_TYPE_CARDINAL + */ + typedef struct BDF_PropertyRec_ + { + BDF_PropertyType type; + union { + const char* atom; + FT_Int32 integer; + FT_UInt32 cardinal; + + } u; + + } BDF_PropertyRec; + + /********************************************************************** * * @function: @@ -74,6 +141,37 @@ FT_BEGIN_HEADER const char* *acharset_encoding, const char* *acharset_registry ); + /********************************************************************** + * + * @function: + * FT_Get_BDF_Property + * + * @description: + * Retrieves a BDF property from a BDF or PCF font file + * + * @input: + * face :: handle to input face + * name :: property name + * + * @output: + * aproperty :: the property + * + * @return: + * FreeType error code. 0 means success. + * + * @note: + * This function works with BDF _and_ PCF fonts. It returns an error + * otherwise. it also returns an error when the property is not in the + * font. + * + * in case of error, "aproperty->type" is always set to + * @BDF_PROPERTY_TYPE_NONE + */ + FT_EXPORT( FT_Error ) + FT_Get_BDF_Property( FT_Face face, + const char* prop_name, + BDF_PropertyRec *aproperty ); + /* */ FT_END_HEADER @@ -81,4 +179,4 @@ FT_END_HEADER #endif /* __FTBDF_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftcache.h b/headers/libs/freetype2/freetype/ftcache.h index 82af39142a..e8c0eac6d8 100644 --- a/headers/libs/freetype2/freetype/ftcache.h +++ b/headers/libs/freetype2/freetype/ftcache.h @@ -412,4 +412,4 @@ FT_END_HEADER #endif /* __FTCACHE_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftchapters.h b/headers/libs/freetype2/freetype/ftchapters.h index c134ec122a..d8f6909c09 100644 --- a/headers/libs/freetype2/freetype/ftchapters.h +++ b/headers/libs/freetype2/freetype/ftchapters.h @@ -66,4 +66,4 @@ /* module_management */ /* */ /***************************************************************************/ - + diff --git a/headers/libs/freetype2/freetype/fterrdef.h b/headers/libs/freetype2/freetype/fterrdef.h index 4ef606de85..8dba978cbf 100644 --- a/headers/libs/freetype2/freetype/fterrdef.h +++ b/headers/libs/freetype2/freetype/fterrdef.h @@ -31,199 +31,118 @@ /* generic errors */ - FT_NOERRORDEF_( Ok, 0x00, \ - "no error" ) + FT_NOERRORDEF_( Ok, 0x00, "no error" ) - FT_ERRORDEF_( Cannot_Open_Resource, 0x01, \ - "cannot open resource" ) - FT_ERRORDEF_( Unknown_File_Format, 0x02, \ - "unknown file format" ) - FT_ERRORDEF_( Invalid_File_Format, 0x03, \ - "broken file" ) - FT_ERRORDEF_( Invalid_Version, 0x04, \ - "invalid FreeType version" ) - FT_ERRORDEF_( Lower_Module_Version, 0x05, \ - "module version is too low" ) - FT_ERRORDEF_( Invalid_Argument, 0x06, \ - "invalid argument" ) - FT_ERRORDEF_( Unimplemented_Feature, 0x07, \ - "unimplemented feature" ) - FT_ERRORDEF_( Invalid_Table, 0x08, \ - "broken table" ) - FT_ERRORDEF_( Invalid_Offset, 0x09, \ - "broken offset within table" ) + FT_ERRORDEF_( Cannot_Open_Resource, 0x01, "cannot open resource" ) + FT_ERRORDEF_( Unknown_File_Format, 0x02, "unknown file format" ) + FT_ERRORDEF_( Invalid_File_Format, 0x03, "broken file" ) + FT_ERRORDEF_( Invalid_Version, 0x04, "invalid FreeType version" ) + FT_ERRORDEF_( Lower_Module_Version, 0x05, "module version is too low" ) + FT_ERRORDEF_( Invalid_Argument, 0x06, "invalid argument" ) + FT_ERRORDEF_( Unimplemented_Feature, 0x07, "unimplemented feature" ) + FT_ERRORDEF_( Invalid_Table, 0x08, "broken table" ) + FT_ERRORDEF_( Invalid_Offset, 0x09, "broken offset within table" ) /* glyph/character errors */ - FT_ERRORDEF_( Invalid_Glyph_Index, 0x10, \ - "invalid glyph index" ) - FT_ERRORDEF_( Invalid_Character_Code, 0x11, \ - "invalid character code" ) - FT_ERRORDEF_( Invalid_Glyph_Format, 0x12, \ - "unsupported glyph image format" ) - FT_ERRORDEF_( Cannot_Render_Glyph, 0x13, \ - "cannot render this glyph format" ) - FT_ERRORDEF_( Invalid_Outline, 0x14, \ - "invalid outline" ) - FT_ERRORDEF_( Invalid_Composite, 0x15, \ - "invalid composite glyph" ) - FT_ERRORDEF_( Too_Many_Hints, 0x16, \ - "too many hints" ) - FT_ERRORDEF_( Invalid_Pixel_Size, 0x17, \ - "invalid pixel size" ) + FT_ERRORDEF_( Invalid_Glyph_Index, 0x10, "invalid glyph index" ) + FT_ERRORDEF_( Invalid_Character_Code, 0x11, "invalid character code" ) + FT_ERRORDEF_( Invalid_Glyph_Format, 0x12, "unsupported glyph image format" ) + FT_ERRORDEF_( Cannot_Render_Glyph, 0x13, "cannot render this glyph format" ) + FT_ERRORDEF_( Invalid_Outline, 0x14, "invalid outline" ) + FT_ERRORDEF_( Invalid_Composite, 0x15, "invalid composite glyph" ) + FT_ERRORDEF_( Too_Many_Hints, 0x16, "too many hints" ) + FT_ERRORDEF_( Invalid_Pixel_Size, 0x17, "invalid pixel size" ) /* handle errors */ - FT_ERRORDEF_( Invalid_Handle, 0x20, \ - "invalid object handle" ) - FT_ERRORDEF_( Invalid_Library_Handle, 0x21, \ - "invalid library handle" ) - FT_ERRORDEF_( Invalid_Driver_Handle, 0x22, \ - "invalid module handle" ) - FT_ERRORDEF_( Invalid_Face_Handle, 0x23, \ - "invalid face handle" ) - FT_ERRORDEF_( Invalid_Size_Handle, 0x24, \ - "invalid size handle" ) - FT_ERRORDEF_( Invalid_Slot_Handle, 0x25, \ - "invalid glyph slot handle" ) - FT_ERRORDEF_( Invalid_CharMap_Handle, 0x26, \ - "invalid charmap handle" ) - FT_ERRORDEF_( Invalid_Cache_Handle, 0x27, \ - "invalid cache manager handle" ) - FT_ERRORDEF_( Invalid_Stream_Handle, 0x28, \ - "invalid stream handle" ) + FT_ERRORDEF_( Invalid_Handle, 0x20, "invalid object handle" ) + FT_ERRORDEF_( Invalid_Library_Handle, 0x21, "invalid library handle" ) + FT_ERRORDEF_( Invalid_Driver_Handle, 0x22, "invalid module handle" ) + FT_ERRORDEF_( Invalid_Face_Handle, 0x23, "invalid face handle" ) + FT_ERRORDEF_( Invalid_Size_Handle, 0x24, "invalid size handle" ) + FT_ERRORDEF_( Invalid_Slot_Handle, 0x25, "invalid glyph slot handle" ) + FT_ERRORDEF_( Invalid_CharMap_Handle, 0x26, "invalid charmap handle" ) + FT_ERRORDEF_( Invalid_Cache_Handle, 0x27, "invalid cache manager handle" ) + FT_ERRORDEF_( Invalid_Stream_Handle, 0x28, "invalid stream handle" ) /* driver errors */ - FT_ERRORDEF_( Too_Many_Drivers, 0x30, \ - "too many modules" ) - FT_ERRORDEF_( Too_Many_Extensions, 0x31, \ - "too many extensions" ) + FT_ERRORDEF_( Too_Many_Drivers, 0x30, "too many modules" ) + FT_ERRORDEF_( Too_Many_Extensions, 0x31, "too many extensions" ) /* memory errors */ - FT_ERRORDEF_( Out_Of_Memory, 0x40, \ - "out of memory" ) - FT_ERRORDEF_( Unlisted_Object, 0x41, \ - "unlisted object" ) + FT_ERRORDEF_( Out_Of_Memory, 0x40, "out of memory" ) + FT_ERRORDEF_( Unlisted_Object, 0x41, "unlisted object" ) /* stream errors */ - FT_ERRORDEF_( Cannot_Open_Stream, 0x51, \ - "cannot open stream" ) - FT_ERRORDEF_( Invalid_Stream_Seek, 0x52, \ - "invalid stream seek" ) - FT_ERRORDEF_( Invalid_Stream_Skip, 0x53, \ - "invalid stream skip" ) - FT_ERRORDEF_( Invalid_Stream_Read, 0x54, \ - "invalid stream read" ) - FT_ERRORDEF_( Invalid_Stream_Operation, 0x55, \ - "invalid stream operation" ) - FT_ERRORDEF_( Invalid_Frame_Operation, 0x56, \ - "invalid frame operation" ) - FT_ERRORDEF_( Nested_Frame_Access, 0x57, \ - "nested frame access" ) - FT_ERRORDEF_( Invalid_Frame_Read, 0x58, \ - "invalid frame read" ) + FT_ERRORDEF_( Cannot_Open_Stream, 0x51, "cannot open stream" ) + FT_ERRORDEF_( Invalid_Stream_Seek, 0x52, "invalid stream seek" ) + FT_ERRORDEF_( Invalid_Stream_Skip, 0x53, "invalid stream skip" ) + FT_ERRORDEF_( Invalid_Stream_Read, 0x54, "invalid stream read" ) + FT_ERRORDEF_( Invalid_Stream_Operation, 0x55, "invalid stream operation" ) + FT_ERRORDEF_( Invalid_Frame_Operation, 0x56, "invalid frame operation" ) + FT_ERRORDEF_( Nested_Frame_Access, 0x57, "nested frame access" ) + FT_ERRORDEF_( Invalid_Frame_Read, 0x58, "invalid frame read" ) /* raster errors */ - FT_ERRORDEF_( Raster_Uninitialized, 0x60, \ - "raster uninitialized" ) - FT_ERRORDEF_( Raster_Corrupted, 0x61, \ - "raster corrupted" ) - FT_ERRORDEF_( Raster_Overflow, 0x62, \ - "raster overflow" ) - FT_ERRORDEF_( Raster_Negative_Height, 0x63, \ - "negative height while rastering" ) + FT_ERRORDEF_( Raster_Uninitialized, 0x60, "raster uninitialized" ) + FT_ERRORDEF_( Raster_Corrupted, 0x61, "raster corrupted" ) + FT_ERRORDEF_( Raster_Overflow, 0x62, "raster overflow" ) + FT_ERRORDEF_( Raster_Negative_Height, 0x63, "negative height while rastering" ) /* cache errors */ - FT_ERRORDEF_( Too_Many_Caches, 0x70, \ - "too many registered caches" ) + FT_ERRORDEF_( Too_Many_Caches, 0x70, "too many registered caches" ) /* TrueType and SFNT errors */ - FT_ERRORDEF_( Invalid_Opcode, 0x80, \ - "invalid opcode" ) - FT_ERRORDEF_( Too_Few_Arguments, 0x81, \ - "too few arguments" ) - FT_ERRORDEF_( Stack_Overflow, 0x82, \ - "stack overflow" ) - FT_ERRORDEF_( Code_Overflow, 0x83, \ - "code overflow" ) - FT_ERRORDEF_( Bad_Argument, 0x84, \ - "bad argument" ) - FT_ERRORDEF_( Divide_By_Zero, 0x85, \ - "division by zero" ) - FT_ERRORDEF_( Invalid_Reference, 0x86, \ - "invalid reference" ) - FT_ERRORDEF_( Debug_OpCode, 0x87, \ - "found debug opcode" ) - FT_ERRORDEF_( ENDF_In_Exec_Stream, 0x88, \ - "found ENDF opcode in execution stream" ) - FT_ERRORDEF_( Nested_DEFS, 0x89, \ - "nested DEFS" ) - FT_ERRORDEF_( Invalid_CodeRange, 0x8A, \ - "invalid code range" ) - FT_ERRORDEF_( Execution_Too_Long, 0x8B, \ - "execution context too long" ) - FT_ERRORDEF_( Too_Many_Function_Defs, 0x8C, \ - "too many function definitions" ) - FT_ERRORDEF_( Too_Many_Instruction_Defs, 0x8D, \ - "too many instruction definitions" ) - FT_ERRORDEF_( Table_Missing, 0x8E, \ - "SFNT font table missing" ) - FT_ERRORDEF_( Horiz_Header_Missing, 0x8F, \ - "horizontal header (hhea) table missing" ) - FT_ERRORDEF_( Locations_Missing, 0x90, \ - "locations (loca) table missing" ) - FT_ERRORDEF_( Name_Table_Missing, 0x91, \ - "name table missing" ) - FT_ERRORDEF_( CMap_Table_Missing, 0x92, \ - "character map (cmap) table missing" ) - FT_ERRORDEF_( Hmtx_Table_Missing, 0x93, \ - "horizontal metrics (hmtx) table missing" ) - FT_ERRORDEF_( Post_Table_Missing, 0x94, \ - "PostScript (post) table missing" ) - FT_ERRORDEF_( Invalid_Horiz_Metrics, 0x95, \ - "invalid horizontal metrics" ) - FT_ERRORDEF_( Invalid_CharMap_Format, 0x96, \ - "invalid character map (cmap) format" ) - FT_ERRORDEF_( Invalid_PPem, 0x97, \ - "invalid ppem value" ) - FT_ERRORDEF_( Invalid_Vert_Metrics, 0x98, \ - "invalid vertical metrics" ) - FT_ERRORDEF_( Could_Not_Find_Context, 0x99, \ - "could not find context" ) - FT_ERRORDEF_( Invalid_Post_Table_Format, 0x9A, \ - "invalid PostScript (post) table format" ) - FT_ERRORDEF_( Invalid_Post_Table, 0x9B, \ - "invalid PostScript (post) table" ) + FT_ERRORDEF_( Invalid_Opcode, 0x80, "invalid opcode" ) + FT_ERRORDEF_( Too_Few_Arguments, 0x81, "too few arguments" ) + FT_ERRORDEF_( Stack_Overflow, 0x82, "stack overflow" ) + FT_ERRORDEF_( Code_Overflow, 0x83, "code overflow" ) + FT_ERRORDEF_( Bad_Argument, 0x84, "bad argument" ) + FT_ERRORDEF_( Divide_By_Zero, 0x85, "division by zero" ) + FT_ERRORDEF_( Invalid_Reference, 0x86, "invalid reference" ) + FT_ERRORDEF_( Debug_OpCode, 0x87, "found debug opcode" ) + FT_ERRORDEF_( ENDF_In_Exec_Stream, 0x88, "found ENDF opcode in execution stream" ) + FT_ERRORDEF_( Nested_DEFS, 0x89, "nested DEFS" ) + FT_ERRORDEF_( Invalid_CodeRange, 0x8A, "invalid code range" ) + FT_ERRORDEF_( Execution_Too_Long, 0x8B, "execution context too long" ) + FT_ERRORDEF_( Too_Many_Function_Defs, 0x8C, "too many function definitions" ) + FT_ERRORDEF_( Too_Many_Instruction_Defs, 0x8D, "too many instruction definitions" ) + FT_ERRORDEF_( Table_Missing, 0x8E, "SFNT font table missing" ) + FT_ERRORDEF_( Horiz_Header_Missing, 0x8F, "horizontal header (hhea) table missing" ) + FT_ERRORDEF_( Locations_Missing, 0x90, "locations (loca) table missing" ) + FT_ERRORDEF_( Name_Table_Missing, 0x91, "name table missing" ) + FT_ERRORDEF_( CMap_Table_Missing, 0x92, "character map (cmap) table missing" ) + FT_ERRORDEF_( Hmtx_Table_Missing, 0x93, "horizontal metrics (hmtx) table missing" ) + FT_ERRORDEF_( Post_Table_Missing, 0x94, "PostScript (post) table missing" ) + FT_ERRORDEF_( Invalid_Horiz_Metrics, 0x95, "invalid horizontal metrics" ) + FT_ERRORDEF_( Invalid_CharMap_Format, 0x96, "invalid character map (cmap) format" ) + FT_ERRORDEF_( Invalid_PPem, 0x97, "invalid ppem value" ) + FT_ERRORDEF_( Invalid_Vert_Metrics, 0x98, "invalid vertical metrics" ) + FT_ERRORDEF_( Could_Not_Find_Context, 0x99, "could not find context" ) + FT_ERRORDEF_( Invalid_Post_Table_Format, 0x9A, "invalid PostScript (post) table format" ) + FT_ERRORDEF_( Invalid_Post_Table, 0x9B, "invalid PostScript (post) table" ) /* CFF, CID, and Type 1 errors */ - FT_ERRORDEF_( Syntax_Error, 0xA0, \ - "opcode syntax error" ) - FT_ERRORDEF_( Stack_Underflow, 0xA1, \ - "argument stack underflow" ) + FT_ERRORDEF_( Syntax_Error, 0xA0, "opcode syntax error" ) + FT_ERRORDEF_( Stack_Underflow, 0xA1, "argument stack underflow" ) /* BDF errors */ - FT_ERRORDEF_( Missing_Startfont_Field, 0xB0, \ - "`STARTFONT' field missing" ) - FT_ERRORDEF_( Missing_Font_Field, 0xB1, \ - "`FONT' field missing" ) - FT_ERRORDEF_( Missing_Size_Field, 0xB2, \ - "`SIZE' field missing" ) - FT_ERRORDEF_( Missing_Chars_Field, 0xB3, \ - "`CHARS' field missing" ) - FT_ERRORDEF_( Missing_Startchar_Field, 0xB4, \ - "`STARTCHAR' field missing" ) - FT_ERRORDEF_( Missing_Encoding_Field, 0xB5, \ - "`ENCODING' field missing" ) - FT_ERRORDEF_( Missing_Bbx_Field, 0xB6, \ - "`BBX' field missing" ) + FT_ERRORDEF_( Missing_Startfont_Field, 0xB0, "`STARTFONT' field missing" ) + FT_ERRORDEF_( Missing_Font_Field, 0xB1, "`FONT' field missing" ) + FT_ERRORDEF_( Missing_Size_Field, 0xB2, "`SIZE' field missing" ) + FT_ERRORDEF_( Missing_Chars_Field, 0xB3, "`CHARS' field missing" ) + FT_ERRORDEF_( Missing_Startchar_Field, 0xB4, "`STARTCHAR' field missing" ) + FT_ERRORDEF_( Missing_Encoding_Field, 0xB5, "`ENCODING' field missing" ) + FT_ERRORDEF_( Missing_Bbx_Field, 0xB6, "`BBX' field missing" ) -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/fterrors.h b/headers/libs/freetype2/freetype/fterrors.h index 1def4f9ce9..179d9964b1 100644 --- a/headers/libs/freetype2/freetype/fterrors.h +++ b/headers/libs/freetype2/freetype/fterrors.h @@ -155,12 +155,10 @@ /* this macro is used to define an error */ -#define FT_ERRORDEF_( e, v, s ) \ - FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v + FT_ERR_BASE, s ) +#define FT_ERRORDEF_( e, v, s ) FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v + FT_ERR_BASE, s ) /* this is only used for FT_Err_Ok, which must be 0! */ -#define FT_NOERRORDEF_( e, v, s ) \ - FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v, s ) +#define FT_NOERRORDEF_( e, v, s ) FT_ERRORDEF( FT_ERR_CAT( FT_ERR_PREFIX, e ), v, s ) #ifdef FT_ERROR_START_LIST @@ -204,4 +202,4 @@ #endif /* __FTERRORS_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftglyph.h b/headers/libs/freetype2/freetype/ftglyph.h index 67a698f55a..cc180fb109 100644 --- a/headers/libs/freetype2/freetype/ftglyph.h +++ b/headers/libs/freetype2/freetype/ftglyph.h @@ -483,7 +483,7 @@ FT_BEGIN_HEADER /* The result is undefined if either `a' or `b' is zero. */ /* */ FT_EXPORT( void ) - FT_Matrix_Multiply( FT_Matrix* a, + FT_Matrix_Multiply( const FT_Matrix* a, FT_Matrix* b ); @@ -514,4 +514,4 @@ FT_END_HEADER #endif /* __FTGLYPH_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftgzip.h b/headers/libs/freetype2/freetype/ftgzip.h index 59de4ddf23..63bde07741 100644 --- a/headers/libs/freetype2/freetype/ftgzip.h +++ b/headers/libs/freetype2/freetype/ftgzip.h @@ -16,8 +16,8 @@ /***************************************************************************/ -#ifndef __FTXF86_H__ -#define __FTXF86_H__ +#ifndef __FTGZIP_H__ +#define __FTGZIP_H__ #include #include FT_FREETYPE_H @@ -83,4 +83,4 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FTXF86_H__ */ +#endif /* __FTGZIP_H__ */ diff --git a/headers/libs/freetype2/freetype/ftimage.h b/headers/libs/freetype2/freetype/ftimage.h index fe46bf529b..5c7013352e 100644 --- a/headers/libs/freetype2/freetype/ftimage.h +++ b/headers/libs/freetype2/freetype/ftimage.h @@ -1238,4 +1238,4 @@ FT_END_HEADER #endif /* __FTIMAGE_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftincrem.h b/headers/libs/freetype2/freetype/ftincrem.h index 08ce7a9598..53f8a82ee8 100644 --- a/headers/libs/freetype2/freetype/ftincrem.h +++ b/headers/libs/freetype2/freetype/ftincrem.h @@ -174,21 +174,22 @@ FT_BEGIN_HEADER * vertical :: * If true, return vertical metrics. * + * ametrics :: + * This parameter is used for both input and output. + * The original glyph metrics, if any, in font units. If metrics are + * not available all the values must be set to zero. + * * @output: * ametrics :: - * The glyph metrics in font units. - * - * afound :: - * True if there are metrics at all. + * The replacement glyph metrics in font units. * */ typedef FT_Error (*FT_Incremental_GetGlyphMetricsFunc) - ( FT_Incremental incremental, - FT_UInt glyph_index, - FT_Bool vertical, - FT_Incremental_MetricsRec *ametrics, - FT_Bool *afound ); + ( FT_Incremental incremental, + FT_UInt glyph_index, + FT_Bool vertical, + FT_Incremental_MetricsRec *ametrics ); /************************************************************************** @@ -283,4 +284,4 @@ FT_END_HEADER #endif /* __FTINCREM_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftlist.h b/headers/libs/freetype2/freetype/ftlist.h index 1c5101700b..35b508e3fb 100644 --- a/headers/libs/freetype2/freetype/ftlist.h +++ b/headers/libs/freetype2/freetype/ftlist.h @@ -265,4 +265,4 @@ FT_END_HEADER #endif /* __FTLIST_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftmac.h b/headers/libs/freetype2/freetype/ftmac.h index b9f89bab4c..02b8a8bcf0 100644 --- a/headers/libs/freetype2/freetype/ftmac.h +++ b/headers/libs/freetype2/freetype/ftmac.h @@ -125,4 +125,4 @@ FT_END_HEADER #endif /* __FTMAC_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftmm.h b/headers/libs/freetype2/freetype/ftmm.h index 5e681b2c4f..6a9cdc63af 100644 --- a/headers/libs/freetype2/freetype/ftmm.h +++ b/headers/libs/freetype2/freetype/ftmm.h @@ -200,4 +200,4 @@ FT_END_HEADER #endif /* __FTMM_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftmoderr.h b/headers/libs/freetype2/freetype/ftmoderr.h index 59e15c10c8..ef7fe0c955 100644 --- a/headers/libs/freetype2/freetype/ftmoderr.h +++ b/headers/libs/freetype2/freetype/ftmoderr.h @@ -146,4 +146,4 @@ #endif /* __FTMODERR_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftmodule.h b/headers/libs/freetype2/freetype/ftmodule.h index 2ec5a03079..32be39c74d 100644 --- a/headers/libs/freetype2/freetype/ftmodule.h +++ b/headers/libs/freetype2/freetype/ftmodule.h @@ -304,4 +304,4 @@ FT_END_HEADER #endif /* __FTMODULE_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftoutln.h b/headers/libs/freetype2/freetype/ftoutln.h index fdf7ed2983..555c05891f 100644 --- a/headers/libs/freetype2/freetype/ftoutln.h +++ b/headers/libs/freetype2/freetype/ftoutln.h @@ -397,4 +397,4 @@ FT_END_HEADER #endif /* __FTOUTLN_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftpfr.h b/headers/libs/freetype2/freetype/ftpfr.h index 212539101c..e3a8f39695 100644 --- a/headers/libs/freetype2/freetype/ftpfr.h +++ b/headers/libs/freetype2/freetype/ftpfr.h @@ -153,4 +153,4 @@ FT_END_HEADER #endif /* __FTBDF_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftrender.h b/headers/libs/freetype2/freetype/ftrender.h index db3ca94dd7..8e12cb23fa 100644 --- a/headers/libs/freetype2/freetype/ftrender.h +++ b/headers/libs/freetype2/freetype/ftrender.h @@ -226,4 +226,4 @@ FT_END_HEADER #endif /* __FTRENDER_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftsizes.h b/headers/libs/freetype2/freetype/ftsizes.h index 0fd6f0ffba..350f3e4c83 100644 --- a/headers/libs/freetype2/freetype/ftsizes.h +++ b/headers/libs/freetype2/freetype/ftsizes.h @@ -148,4 +148,4 @@ FT_END_HEADER #endif /* __FTSIZES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftsnames.h b/headers/libs/freetype2/freetype/ftsnames.h index 356f983490..dbc76f0970 100644 --- a/headers/libs/freetype2/freetype/ftsnames.h +++ b/headers/libs/freetype2/freetype/ftsnames.h @@ -158,4 +158,4 @@ FT_END_HEADER #endif /* __FT_SFNT_NAMES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftstroker.h b/headers/libs/freetype2/freetype/ftstroker.h index a714056411..9ef3c60e0c 100644 --- a/headers/libs/freetype2/freetype/ftstroker.h +++ b/headers/libs/freetype2/freetype/ftstroker.h @@ -136,4 +136,4 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FT_STROKER_H__ */ +#endif /* __FT_STROKER_H__ */ diff --git a/headers/libs/freetype2/freetype/ftsynth.h b/headers/libs/freetype2/freetype/ftsynth.h index 2424ff6273..049574b9f1 100644 --- a/headers/libs/freetype2/freetype/ftsynth.h +++ b/headers/libs/freetype2/freetype/ftsynth.h @@ -62,4 +62,4 @@ FT_END_HEADER #endif /* __FTSYNTH_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftsysio.h b/headers/libs/freetype2/freetype/ftsysio.h index f8e49543f3..887afa51fa 100644 --- a/headers/libs/freetype2/freetype/ftsysio.h +++ b/headers/libs/freetype2/freetype/ftsysio.h @@ -192,4 +192,4 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FT_SYSTEM_STREAM_H__ */ +#endif /* __FT_SYSTEM_STREAM_H__ */ diff --git a/headers/libs/freetype2/freetype/ftsysmem.h b/headers/libs/freetype2/freetype/ftsysmem.h index 8de0c4db03..60c891a4f1 100644 --- a/headers/libs/freetype2/freetype/ftsysmem.h +++ b/headers/libs/freetype2/freetype/ftsysmem.h @@ -199,4 +199,4 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FT_SYSTEM_MEMORY_H__ */ +#endif /* __FT_SYSTEM_MEMORY_H__ */ diff --git a/headers/libs/freetype2/freetype/ftsystem.h b/headers/libs/freetype2/freetype/ftsystem.h index d1c55f7aea..b056a57270 100644 --- a/headers/libs/freetype2/freetype/ftsystem.h +++ b/headers/libs/freetype2/freetype/ftsystem.h @@ -306,4 +306,4 @@ FT_END_HEADER #endif /* __FTSYSTEM_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/fttrigon.h b/headers/libs/freetype2/freetype/fttrigon.h index 3b8257b6d6..9af1a273b7 100644 --- a/headers/libs/freetype2/freetype/fttrigon.h +++ b/headers/libs/freetype2/freetype/fttrigon.h @@ -322,4 +322,4 @@ FT_END_HEADER #endif /* __FTTRIGON_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/fttypes.h b/headers/libs/freetype2/freetype/fttypes.h index 2782f74d58..1ea8dd6647 100644 --- a/headers/libs/freetype2/freetype/fttypes.h +++ b/headers/libs/freetype2/freetype/fttypes.h @@ -555,4 +555,4 @@ FT_END_HEADER #endif /* __FTTYPES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ftxf86.h b/headers/libs/freetype2/freetype/ftxf86.h index 5a7582f917..030ab98e3c 100644 --- a/headers/libs/freetype2/freetype/ftxf86.h +++ b/headers/libs/freetype2/freetype/ftxf86.h @@ -50,4 +50,4 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FTXF86_H__ */ +#endif /* __FTXF86_H__ */ diff --git a/headers/libs/freetype2/freetype/internal/autohint.h b/headers/libs/freetype2/freetype/internal/autohint.h index 22340afc3f..cda3d19cfc 100644 --- a/headers/libs/freetype2/freetype/internal/autohint.h +++ b/headers/libs/freetype2/freetype/internal/autohint.h @@ -202,4 +202,4 @@ FT_END_HEADER #endif /* __AUTOHINT_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/bdftypes.h b/headers/libs/freetype2/freetype/internal/bdftypes.h index cd4dcabd86..8f2250e528 100644 --- a/headers/libs/freetype2/freetype/internal/bdftypes.h +++ b/headers/libs/freetype2/freetype/internal/bdftypes.h @@ -29,6 +29,7 @@ THE SOFTWARE. #include #include FT_FREETYPE_H +#include FT_BDF_H FT_BEGIN_HEADER @@ -44,10 +45,14 @@ FT_BEGIN_HEADER } BDF_Public_FaceRec, *BDF_Public_Face; + typedef FT_Error (*BDF_GetPropertyFunc)( FT_Face face, + const char* prop_name, + BDF_PropertyRec *aproperty ); + FT_END_HEADER #endif /* __BDFTYPES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/cfftypes.h b/headers/libs/freetype2/freetype/internal/cfftypes.h index 82e1e91b4e..81b1d3f61a 100644 --- a/headers/libs/freetype2/freetype/internal/cfftypes.h +++ b/headers/libs/freetype2/freetype/internal/cfftypes.h @@ -253,4 +253,4 @@ FT_END_HEADER #endif /* __CFFTYPES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/fnttypes.h b/headers/libs/freetype2/freetype/internal/fnttypes.h index 54e37ec4c3..032b1d5336 100644 --- a/headers/libs/freetype2/freetype/internal/fnttypes.h +++ b/headers/libs/freetype2/freetype/internal/fnttypes.h @@ -23,6 +23,7 @@ #include #include FT_FREETYPE_H +#include FT_WINFONTS_H FT_BEGIN_HEADER @@ -71,57 +72,15 @@ FT_BEGIN_HEADER #define WINFNT_NE_MAGIC 0x454E - typedef struct WinFNT_HeaderRec_ - { - FT_UShort version; - FT_ULong file_size; - FT_Byte copyright[60]; - FT_UShort file_type; - FT_UShort nominal_point_size; - FT_UShort vertical_resolution; - FT_UShort horizontal_resolution; - FT_UShort ascent; - FT_UShort internal_leading; - FT_UShort external_leading; - FT_Byte italic; - FT_Byte underline; - FT_Byte strike_out; - FT_UShort weight; - FT_Byte charset; - FT_UShort pixel_width; - FT_UShort pixel_height; - FT_Byte pitch_and_family; - FT_UShort avg_width; - FT_UShort max_width; - FT_Byte first_char; - FT_Byte last_char; - FT_Byte default_char; - FT_Byte break_char; - FT_UShort bytes_per_row; - FT_ULong device_offset; - FT_ULong face_name_offset; - FT_ULong bits_pointer; - FT_ULong bits_offset; - FT_Byte reserved; - FT_ULong flags; - FT_UShort A_space; - FT_UShort B_space; - FT_UShort C_space; - FT_UShort color_table_offset; - FT_Byte reserved2[4]; - - } WinFNT_HeaderRec, *WinFNT_Header; - - typedef struct FNT_FontRec_ { - FT_ULong offset; - FT_Int size_shift; + FT_ULong offset; + FT_Int size_shift; - WinFNT_HeaderRec header; + FT_WinFNT_HeaderRec header; - FT_Byte* fnt_frame; - FT_ULong fnt_size; + FT_Byte* fnt_frame; + FT_ULong fnt_size; } FNT_FontRec, *FNT_Font; @@ -152,4 +111,4 @@ FT_END_HEADER #endif /* __FNTTYPES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/ftcalc.h b/headers/libs/freetype2/freetype/internal/ftcalc.h index af1f640720..08d4e15232 100644 --- a/headers/libs/freetype2/freetype/internal/ftcalc.h +++ b/headers/libs/freetype2/freetype/internal/ftcalc.h @@ -74,4 +74,4 @@ FT_END_HEADER #endif /* __FTCALC_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/ftcore.h b/headers/libs/freetype2/freetype/internal/ftcore.h index 3c3c94ff3a..e5763ebd65 100644 --- a/headers/libs/freetype2/freetype/internal/ftcore.h +++ b/headers/libs/freetype2/freetype/internal/ftcore.h @@ -182,4 +182,4 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FT_CORE_H__ */ +#endif /* __FT_CORE_H__ */ diff --git a/headers/libs/freetype2/freetype/internal/ftdebug.h b/headers/libs/freetype2/freetype/internal/ftdebug.h index 129c91f6ad..bce1e7b8a9 100644 --- a/headers/libs/freetype2/freetype/internal/ftdebug.h +++ b/headers/libs/freetype2/freetype/internal/ftdebug.h @@ -193,4 +193,4 @@ FT_END_HEADER #endif /* __FTDEBUG_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/ftdriver.h b/headers/libs/freetype2/freetype/internal/ftdriver.h index 9323910b25..ffa7215e4f 100644 --- a/headers/libs/freetype2/freetype/internal/ftdriver.h +++ b/headers/libs/freetype2/freetype/internal/ftdriver.h @@ -199,4 +199,4 @@ FT_END_HEADER #endif /* __FTDRIVER_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/ftexcept.h b/headers/libs/freetype2/freetype/internal/ftexcept.h index f5495e56c8..c53af9d716 100644 --- a/headers/libs/freetype2/freetype/internal/ftexcept.h +++ b/headers/libs/freetype2/freetype/internal/ftexcept.h @@ -79,4 +79,4 @@ FT_BEGIN_HEADER >>>>>>> 1.2 FT_END_HEADER -#endif /* __FT_EXCEPT_H__ */ +#endif /* __FT_EXCEPT_H__ */ diff --git a/headers/libs/freetype2/freetype/internal/ftgloadr.h b/headers/libs/freetype2/freetype/internal/ftgloadr.h index d66d10b195..7ac2901de7 100644 --- a/headers/libs/freetype2/freetype/internal/ftgloadr.h +++ b/headers/libs/freetype2/freetype/internal/ftgloadr.h @@ -150,4 +150,4 @@ FT_END_HEADER #endif /* __FTGLOADR_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/fthash.h b/headers/libs/freetype2/freetype/internal/fthash.h index b95b6c9250..f676c1e601 100644 --- a/headers/libs/freetype2/freetype/internal/fthash.h +++ b/headers/libs/freetype2/freetype/internal/fthash.h @@ -499,4 +499,4 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FT_HASH_H__ */ +#endif /* __FT_HASH_H__ */ diff --git a/headers/libs/freetype2/freetype/internal/ftmemory.h b/headers/libs/freetype2/freetype/internal/ftmemory.h index cbe66d7f85..9f0128dc7c 100644 --- a/headers/libs/freetype2/freetype/internal/ftmemory.h +++ b/headers/libs/freetype2/freetype/internal/ftmemory.h @@ -293,4 +293,4 @@ FT_END_HEADER #endif /* __FTMEMORY_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/ftobject.h b/headers/libs/freetype2/freetype/internal/ftobject.h index f285d9e207..15b2c8b225 100644 --- a/headers/libs/freetype2/freetype/internal/ftobject.h +++ b/headers/libs/freetype2/freetype/internal/ftobject.h @@ -530,4 +530,4 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FT_OBJECT_H__ */ +#endif /* __FT_OBJECT_H__ */ diff --git a/headers/libs/freetype2/freetype/internal/ftobjs.h b/headers/libs/freetype2/freetype/internal/ftobjs.h index 779ffa1430..3f60b1554c 100644 --- a/headers/libs/freetype2/freetype/internal/ftobjs.h +++ b/headers/libs/freetype2/freetype/internal/ftobjs.h @@ -321,15 +321,6 @@ FT_BEGIN_HEADER FT_UInt32 hint_flags; const char* postscript_name; - - FT_F26Dot6 orig_width; - FT_F26Dot6 orig_height; - - FT_UInt orig_horz_res; - FT_UInt orig_vert_res; - - FT_Fixed orig_x_scale; - FT_Fixed orig_y_scale; #ifdef FT_CONFIG_OPTION_INCREMENTAL FT_Incremental_InterfaceRec* incremental_interface; @@ -471,6 +462,8 @@ FT_BEGIN_HEADER FT_Get_Module_Interface( FT_Library library, const char* mod_name ); + /* */ + /*************************************************************************/ /*************************************************************************/ @@ -543,6 +536,30 @@ FT_BEGIN_HEADER FT_BASE( void ) FT_Done_GlyphSlot( FT_GlyphSlot slot ); + /* */ + + /* + * free the bitmap of a given glyphslot when needed + * (i.e. only when it was allocated with ft_glyphslot_alloc_bitmap) + */ + FT_BASE( void ) + ft_glyphslot_free_bitmap( FT_GlyphSlot slot ); + + /* + * allocate a new bitmap buffer in a glyph slot + */ + FT_BASE( FT_Error ) + ft_glyphslot_alloc_bitmap( FT_GlyphSlot slot, + FT_ULong size ); + + /* + * set the bitmap buffer in a glyph slot to a given pointer. + * the buffer will not be freed by a later call to ft_glyphslot_free_bitmap + */ + FT_BASE( void ) + ft_glyphslot_set_bitmap( FT_GlyphSlot slot, + FT_Pointer buffer ); + /*************************************************************************/ /*************************************************************************/ @@ -800,4 +817,4 @@ FT_END_HEADER #endif /* __FTOBJS_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/ftstream.h b/headers/libs/freetype2/freetype/internal/ftstream.h index 618f64aacd..75d27f46a4 100644 --- a/headers/libs/freetype2/freetype/internal/ftstream.h +++ b/headers/libs/freetype2/freetype/internal/ftstream.h @@ -495,4 +495,4 @@ FT_END_HEADER #endif /* __FTSTREAM_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/fttrace.h b/headers/libs/freetype2/freetype/internal/fttrace.h index ffc0b14175..dc811e3a9e 100644 --- a/headers/libs/freetype2/freetype/internal/fttrace.h +++ b/headers/libs/freetype2/freetype/internal/fttrace.h @@ -103,4 +103,4 @@ FT_TRACE_DEF( bdflib ) FT_TRACE_DEF( pfr ) -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/internal.h b/headers/libs/freetype2/freetype/internal/internal.h index 872f6ac797..2996c962e9 100644 --- a/headers/libs/freetype2/freetype/internal/internal.h +++ b/headers/libs/freetype2/freetype/internal/internal.h @@ -54,4 +54,4 @@ #define FT_INTERNAL_AUTOHINT_H -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/pcftypes.h b/headers/libs/freetype2/freetype/internal/pcftypes.h index 2c924d7d1a..eb90701dae 100644 --- a/headers/libs/freetype2/freetype/internal/pcftypes.h +++ b/headers/libs/freetype2/freetype/internal/pcftypes.h @@ -53,4 +53,4 @@ FT_END_HEADER #endif /* __PCFTYPES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/pfr.h b/headers/libs/freetype2/freetype/internal/pfr.h index cead078188..49a0d40148 100644 --- a/headers/libs/freetype2/freetype/internal/pfr.h +++ b/headers/libs/freetype2/freetype/internal/pfr.h @@ -33,4 +33,4 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FT_INTERNAL_PFR_H__ */ +#endif /* __FT_INTERNAL_PFR_H__ */ diff --git a/headers/libs/freetype2/freetype/internal/psaux.h b/headers/libs/freetype2/freetype/internal/psaux.h index e79f83aa4f..67b3a32e4f 100644 --- a/headers/libs/freetype2/freetype/internal/psaux.h +++ b/headers/libs/freetype2/freetype/internal/psaux.h @@ -714,4 +714,4 @@ FT_END_HEADER #endif /* __PSAUX_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/pshints.h b/headers/libs/freetype2/freetype/internal/pshints.h index 15571d9bc5..5f3005f717 100644 --- a/headers/libs/freetype2/freetype/internal/pshints.h +++ b/headers/libs/freetype2/freetype/internal/pshints.h @@ -623,4 +623,4 @@ FT_END_HEADER #endif /* __PSHINTS_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/psnames.h b/headers/libs/freetype2/freetype/internal/psnames.h index 0f4ec86a83..5cf58b12c6 100644 --- a/headers/libs/freetype2/freetype/internal/psnames.h +++ b/headers/libs/freetype2/freetype/internal/psnames.h @@ -238,4 +238,4 @@ FT_END_HEADER #endif /* __PSNAMES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/sfnt.h b/headers/libs/freetype2/freetype/internal/sfnt.h index 89e9190943..011e894193 100644 --- a/headers/libs/freetype2/freetype/internal/sfnt.h +++ b/headers/libs/freetype2/freetype/internal/sfnt.h @@ -457,6 +457,21 @@ FT_BEGIN_HEADER (*TT_Free_Table_Func)( TT_Face face ); + /*************************************************************************/ + /* */ + /* */ + /* SFNT_Load_Table_Func */ + /* */ + /* */ + /* Loads a given SFNT table in memory */ + /* */ + typedef FT_Error + (*SFNT_Load_Table_Func)( FT_Face face, + FT_ULong tag, + FT_Long offset, + FT_Byte* buffer, + FT_ULong* length ); + /*************************************************************************/ /* */ /* */ @@ -531,4 +546,4 @@ FT_END_HEADER #endif /* __SFNT_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/t1types.h b/headers/libs/freetype2/freetype/internal/t1types.h index 2625394693..ed2081db6a 100644 --- a/headers/libs/freetype2/freetype/internal/t1types.h +++ b/headers/libs/freetype2/freetype/internal/t1types.h @@ -196,4 +196,4 @@ FT_END_HEADER #endif /* __T1TYPES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/t42types.h b/headers/libs/freetype2/freetype/internal/t42types.h index 7562252e60..765ff43371 100644 --- a/headers/libs/freetype2/freetype/internal/t42types.h +++ b/headers/libs/freetype2/freetype/internal/t42types.h @@ -52,4 +52,4 @@ FT_END_HEADER #endif /* __T1TYPES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/internal/tttypes.h b/headers/libs/freetype2/freetype/internal/tttypes.h index 4097ac8f52..4870b4b3cc 100644 --- a/headers/libs/freetype2/freetype/internal/tttypes.h +++ b/headers/libs/freetype2/freetype/internal/tttypes.h @@ -1666,4 +1666,4 @@ FT_END_HEADER #endif /* __TTTYPES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/t1tables.h b/headers/libs/freetype2/freetype/t1tables.h index 200ba9be58..dc2189c672 100644 --- a/headers/libs/freetype2/freetype/t1tables.h +++ b/headers/libs/freetype2/freetype/t1tables.h @@ -388,4 +388,4 @@ FT_END_HEADER #endif /* __T1TABLES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/ttnameid.h b/headers/libs/freetype2/freetype/ttnameid.h index 2111d43fa4..d39d66f317 100644 --- a/headers/libs/freetype2/freetype/ttnameid.h +++ b/headers/libs/freetype2/freetype/ttnameid.h @@ -99,18 +99,18 @@ FT_BEGIN_HEADER * TT_APPLE_ID_UNICODE_1_1 :: * Unicode 1.1; specifies Hangul characters starting at U+34xx. * TT_APPLE_ID_ISO_10646 :: - * Deprecated. + * Deprecated (identical to preceding.) * TT_APPLE_ID_UNICODE_2_0 :: - * Unicode 2.0 and beyond (UTF-16 BMP only). + * Unicode 2.0 and beyond (UTF-16 BMP only.) * TT_APPLE_ID_UNICODE_32 :: - * UTF-32 (Adobe proposal for OpenType). + * Unicode 3.1 and beyond, using UTF-32 */ #define TT_APPLE_ID_DEFAULT 0 /* Unicode 1.0 */ #define TT_APPLE_ID_UNICODE_1_1 1 /* specify Hangul at U+34xx */ #define TT_APPLE_ID_ISO_10646 2 /* deprecated */ #define TT_APPLE_ID_UNICODE_2_0 3 /* or later */ -#define TT_APPLE_ID_UNICODE_32 4 /* Adobe proposal */ +#define TT_APPLE_ID_UNICODE_32 4 /* 2.0 or later, full repertoire */ /*********************************************************************** @@ -257,8 +257,8 @@ FT_BEGIN_HEADER * Corresponds to Microsoft Johab encoding. See @FT_ENCODING_MS_JOHAB. * * TT_MS_ID_UCS_4 :: - * Corresponds to UCS-4 or UTF-32 charmaps. This is a recent Adobe - * proposal for OpenType. + * Corresponds to UCS-4 or UTF-32 charmaps. This has been added into + * OpenType specification as of version 1.4 (mid-2001.) */ #define TT_MS_ID_SYMBOL_CS 0 @@ -443,10 +443,15 @@ FT_BEGIN_HEADER /* of the TTF `name' table if the `platform' identifier code is */ /* TT_PLATFORM_MICROSOFT. */ /* */ - /* The canonical source for the MS assigned LCID's is at */ + /* The canonical source for the MS assigned LCID's used to be at */ /* */ /* http://www.microsoft.com/typography/OTSPEC/lcid-cp.txt */ /* */ + /* Now (2002-11-15), the Microsoft site directs to */ + /* */ + /* http://www.microsoft.com/globaldev/reference/loclanghome.asp */ + /* http://support.microsoft.com/support/kb/articles/Q224/8/04.ASP */ + /* */ #define TT_MS_LANGID_ARABIC_SAUDI_ARABIA 0x0401 #define TT_MS_LANGID_ARABIC_IRAQ 0x0801 #define TT_MS_LANGID_ARABIC_EGYPT 0x0c01 @@ -787,8 +792,10 @@ FT_BEGIN_HEADER /* Bit 7 Greek and Coptic */ #define TT_UCR_GREEK (1L << 7) /* U+0370-U+03FF */ /* Bit 8 is reserved (was: Greek Symbols and Coptic) */ - /* Bit 9 Cyrillic */ + /* Bit 9 Cyrillic + */ + /* Cyrillic Supplementary */ #define TT_UCR_CYRILLIC (1L << 9) /* U+0400-U+04FF */ + /* U+0500-U+052F */ /* Bit 10 Armenian */ #define TT_UCR_ARMENIAN (1L << 10) /* U+0530-U+058F */ /* Bit 11 Hebrew */ @@ -843,10 +850,20 @@ FT_BEGIN_HEADER #define TT_UCR_LETTERLIKE_SYMBOLS (1L << 3) /* U+2100-U+214F */ /* Bit 36 Number Forms */ #define TT_UCR_NUMBER_FORMS (1L << 4) /* U+2150-U+218F */ - /* Bit 37 Arrows */ + /* Bit 37 Arrows + */ + /* Supplemental Arrows-A + */ + /* Supplemental Arrows-B */ #define TT_UCR_ARROWS (1L << 5) /* U+2190-U+21FF */ - /* Bit 38 Mathematical Operators */ + /* U+27F0-U+27FF */ + /* U+2900-U+297F */ + /* Bit 38 Mathematical Operators + */ + /* Supplemental Mathematical Operators + */ + /* Miscellaneous Mathematical Symbols-A + */ + /* Miscellaneous Mathematical Symbols-B */ #define TT_UCR_MATHEMATICAL_OPERATORS (1L << 6) /* U+2200-U+22FF */ + /* U+2A00-U+2AFF */ + /* U+27C0-U+27EF */ + /* U+2980-U+29FF */ /* Bit 39 Miscellaneous Technical */ #define TT_UCR_MISCELLANEOUS_TECHNICAL (1L << 7) /* U+2300-U+23FF */ /* Bit 40 Control Pictures */ @@ -872,8 +889,10 @@ FT_BEGIN_HEADER #define TT_UCR_CJK_SYMBOLS (1L << 16) /* U+3000-U+303F */ /* Bit 49 Hiragana */ #define TT_UCR_HIRAGANA (1L << 17) /* U+3040-U+309F */ - /* Bit 50 Katakana */ + /* Bit 50 Katakana + */ + /* Katakana Phonetic Extensions */ #define TT_UCR_KATAKANA (1L << 18) /* U+30A0-U+30FF */ + /* U+31F0-U+31FF */ /* Bit 51 Bopomofo + */ /* Bopomofo Extended */ #define TT_UCR_BOPOMOFO (1L << 19) /* U+3100-U+312F */ @@ -914,11 +933,16 @@ FT_BEGIN_HEADER /* Kangxi Radicals + */ /* Ideographic Description Characters + */ /* CJK Unified Ideographs Extension A */ + /* CJK Unified Ideographs Extension A + */ + /* CJK Unified Ideographs Extension B + */ + /* Kanbun */ #define TT_UCR_CJK_UNIFIED_IDEOGRAPHS (1L << 27) /* U+4E00-U+9FFF */ /* U+2E80-U+2EFF */ /* U+2F00-U+2FDF */ /* U+2FF0-U+2FFF */ /* U+3400-U+4DB5 */ + /*U+20000-U+2A6DF*/ + /* U+3190-U+319F */ /* Private Use Area */ @@ -927,8 +951,10 @@ FT_BEGIN_HEADER /* Compatibility Area and Specials */ - /* Bit 61 CJK Compatibility Ideographs */ + /* Bit 61 CJK Compatibility Ideographs + */ + /* CJK Compatibility Ideographs Supplement */ #define TT_UCR_CJK_COMPATIBILITY_IDEOGRAPHS (1L << 29) /* U+F900-U+FAFF */ + /*U+2F800-U+2FA1F*/ /* Bit 62 Alphabetic Presentation Forms */ #define TT_UCR_ALPHABETIC_PRESENTATION_FORMS (1L << 30) /* U+FB00-U+FB4F */ /* Bit 63 Arabic Presentation Forms-A */ @@ -975,6 +1001,34 @@ FT_BEGIN_HEADER /* Yi Radicals */ #define TT_UCR_YI (1L << 19) /* U+A000-U+A48F */ /* U+A490-U+A4CF */ + /* Bit 84 Tagalog + */ + /* Hanunoo + */ + /* Buhid + */ + /* Tagbanwa */ +#define TT_UCR_PHILIPPINE (1L << 20) /* U+1700-U+171F */ + /* U+1720-U+173F */ + /* U+1740-U+175F */ + /* U+1760-U+177F */ + /* Bit 85 Old Italic */ +#define TT_UCR_OLD_ITALIC (1L << 21) /*U+10300-U+1032F*/ + /* Bit 86 Gothic */ +#define TT_UCR_GOTHIC (1L << 22) /*U+10330-U+1034F*/ + /* Bit 87 Deseret */ +#define TT_UCR_DESERET (1L << 23) /*U+10400-U+1044F*/ + /* Bit 88 Byzantine Musical Symbols + */ + /* Musical Symbols */ +#define TT_UCR_MUSICAL_SYMBOLS (1L << 24) /*U+1D000-U+1D0FF*/ + /*U+1D100-U+1D1FF*/ + /* Bit 89 Mathematical Alphanumeric Symbols */ +#define TT_UCR_MATH_ALPHANUMERIC_SYMBOLS (1L << 25) /*U+1D400-U+1D7FF*/ + /* Bit 90 Private Use (plane 15) + */ + /* Private Use (plane 16) */ +#define TT_UCR_PRIVATE_USE_SUPPLEMENTARY (1L << 26) /*U+F0000-U+FFFFD*/ + /*U+100000-U+10FFFD*/ + /* Bit 91 Variation Selectors */ +#define TT_UCR_VARIATION_SELECTORS (1L << 27) /* U+FE00-U+FE0F */ + /* Bit 92 Tags */ +#define TT_UCR_TAGS (1L << 28) /*U+E0000-U+E007F*/ /*************************************************************************/ @@ -1019,4 +1073,4 @@ FT_END_HEADER #endif /* __TTNAMEID_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/tttables.h b/headers/libs/freetype2/freetype/tttables.h index d638a21f25..ee9563d418 100644 --- a/headers/libs/freetype2/freetype/tttables.h +++ b/headers/libs/freetype2/freetype/tttables.h @@ -593,6 +593,63 @@ FT_BEGIN_HEADER FT_Get_Sfnt_Table( FT_Face face, FT_Sfnt_Tag tag ); + /************************************************************************** + * + * + * FT_Load_Sfnt_Table + * + * + * Loads any font table into client memory. + * + * + * face :: handle to source face. + * tag :: the 4-byte tag of the table to load. Use the value 0 if + * you want to access the whole font file. Else, you can use + * one of the definitions found in the @FT_TRUETYPE_TAGS_H + * file, or forge a new one with @FT_MAKE_TAG + * + * offset :: the starting offset in the table (or file if tag == 0) + * + * + * buffer :: target buffer address. client must ensure that there are + * enough bytes in it. + * + * + * length :: if the 'length' parameter is NULL, then try to load the whole + * table, and return an error code if it fails. + * + * else, if '*length' is 0, then exit immediately while returning + * the table's (or file) full size in it. + * + * else, the number of bytes to read from the table or file, + * from the starting offset. + * + * + * error code. 0 means success + * + * + * if you need to determine the table's length you should first call this + * function with "*length" set to 0, as in the following example: + * + * { + * FT_ULong length = 0; + * + * error = FT_Load_Sfnt_Table( face, tag, 0, NULL, &length ); + * if ( error ) { ... table does not exist ... } + * + * buffer = malloc( length ); + * if ( buffer == NULL ) { ... not enough memory ... } + * + * error = FT_Load_Sfnt_Table( face,tag, 0, buffer, &length ); + * if ( error ) { ... could not load table ... } + * } + */ + FT_EXPORT( FT_Error ) + FT_Load_Sfnt_Table( FT_Face face, + FT_ULong tag, + FT_Long offset, + FT_Byte* buffer, + FT_ULong* length ); /* */ @@ -602,4 +659,4 @@ FT_END_HEADER #endif /* __TTTABLES_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/freetype/tttags.h b/headers/libs/freetype2/freetype/tttags.h index df09f2a69c..091a14b523 100644 --- a/headers/libs/freetype2/freetype/tttags.h +++ b/headers/libs/freetype2/freetype/tttags.h @@ -71,4 +71,4 @@ FT_END_HEADER #endif /* __TTAGS_H__ */ -/* END */ +/* END */ diff --git a/headers/libs/freetype2/ft2build.h b/headers/libs/freetype2/ft2build.h index 2ecfdeab10..9ab34d9ee8 100644 --- a/headers/libs/freetype2/ft2build.h +++ b/headers/libs/freetype2/ft2build.h @@ -1,39 +1,39 @@ -/***************************************************************************/ -/* */ -/* ft2build.h */ -/* */ -/* FreeType 2 build and setup macros. */ -/* (Generic version) */ -/* */ -/* Copyright 1996-2001 by */ -/* David Turner, Robert Wilhelm, and Werner Lemberg. */ -/* */ -/* This file is part of the FreeType project, and may only be used, */ -/* modified, and distributed under the terms of the FreeType project */ -/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ -/* this file you indicate that you have read the license and */ -/* understand and accept it fully. */ -/* */ -/***************************************************************************/ - - - /*************************************************************************/ - /* */ - /* This file corresponds to the default "ft2build.h" file for */ - /* FreeType 2. It uses the "freetype" include root. */ - /* */ - /* Note that specific platforms might use a different configuration. */ - /* See builds/unix/ft2unix.h for an example. */ - /* */ - /*************************************************************************/ - - -#ifndef __FT2_BUILD_GENERIC_H__ -#define __FT2_BUILD_GENERIC_H__ - -#include - -#endif /* __FT2_BUILD_GENERIC_H__ */ - - -/* END */ +/***************************************************************************/ +/* */ +/* ft2build.h */ +/* */ +/* FreeType 2 build and setup macros. */ +/* (Generic version) */ +/* */ +/* Copyright 1996-2001 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + + /*************************************************************************/ + /* */ + /* This file corresponds to the default "ft2build.h" file for */ + /* FreeType 2. It uses the "freetype" include root. */ + /* */ + /* Note that specific platforms might use a different configuration. */ + /* See builds/unix/ft2unix.h for an example. */ + /* */ + /*************************************************************************/ + + +#ifndef __FT2_BUILD_GENERIC_H__ +#define __FT2_BUILD_GENERIC_H__ + +#include + +#endif /* __FT2_BUILD_GENERIC_H__ */ + + +/* END */