diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-06 11:48:36 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-06 11:48:36 +0000 |
| commit | 20ff8ddf2d9bb41050d10bbc75d61b9161880c7c (patch) | |
| tree | 22566fcd9663b2baa565cd0c64eaa662d6ba03ee /freetype/src/cff/cfftypes.h | |
| parent | c29011f2831315d3da9c4727c1e626d80520b97a (diff) | |
| parent | 6849d83857b4e470a44ad8b6aa5cfb283fd64c89 (diff) | |
| download | vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.tar.gz vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.tar.bz2 vcxsrv-20ff8ddf2d9bb41050d10bbc75d61b9161880c7c.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'freetype/src/cff/cfftypes.h')
| -rw-r--r-- | freetype/src/cff/cfftypes.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/freetype/src/cff/cfftypes.h b/freetype/src/cff/cfftypes.h index 2d81e340f..9725c542a 100644 --- a/freetype/src/cff/cfftypes.h +++ b/freetype/src/cff/cfftypes.h @@ -5,7 +5,7 @@ /* Basic OpenType/CFF type definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2006, 2007, 2008 by */ +/* Copyright 1996-2001, 2002, 2003, 2006, 2007, 2008, 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -24,6 +24,9 @@ #include <ft2build.h> #include <freetype/freetype.h> #include <freetype/t1tables.h> +#include FT_INTERNAL_SERVICE_H +#include FT_SERVICE_POSTSCRIPT_CMAPS_H +#include FT_INTERNAL_POSTSCRIPT_HINTS_H FT_BEGIN_HEADER @@ -204,8 +207,7 @@ FT_BEGIN_HEADER CFF_PrivateRec private_dict; CFF_IndexRec local_subrs_index; - FT_UInt num_local_subrs; - FT_Byte** local_subrs; + FT_Byte** local_subrs; /* array of pointers into Local Subrs INDEX data */ } CFF_SubFontRec, *CFF_SubFont; @@ -229,7 +231,6 @@ FT_BEGIN_HEADER CFF_IndexRec name_index; CFF_IndexRec top_dict_index; - CFF_IndexRec string_index; CFF_IndexRec global_subrs_index; CFF_EncodingRec encoding; @@ -241,9 +242,15 @@ FT_BEGIN_HEADER CFF_IndexRec local_subrs_index; FT_String* font_name; - FT_UInt num_global_subrs; + + /* array of pointers into Global Subrs INDEX data */ FT_Byte** global_subrs; + /* array of pointers into String INDEX data stored at string_pool */ + FT_UInt num_strings; + FT_Byte** strings; + FT_Byte* string_pool; + CFF_SubFontRec top_font; FT_UInt num_subfonts; CFF_SubFont subfonts[CFF_MAX_CID_FONTS]; @@ -251,10 +258,10 @@ FT_BEGIN_HEADER CFF_FDSelectRec fd_select; /* interface to PostScript hinter */ - void* pshinter; + PSHinter_Service pshinter; /* interface to Postscript Names service */ - void* psnames; + FT_Service_PsCMaps psnames; /* since version 2.3.0 */ PS_FontInfoRec* font_info; /* font info dictionary */ |