diff -u -r /Depot/Perforce/all/moduledev/3rdParty/FreeType/Released/2.3.11/FreeType/src/cff/cffload.c /Depot/Perforce/PDFActionsRegressionTester_Main/scc/FreeType/src/cff/cffload.c --- /Depot/Perforce/all/moduledev/3rdParty/FreeType/Released/2.3.11/FreeType/src/cff/cffload.c 2009-10-23 09:37:06.000000000 +0200 +++ /Depot/Perforce/PDFActionsRegressionTester_Main/scc/FreeType/src/cff/cffload.c 2009-11-17 11:05:00.000000000 +0100 @@ -32,6 +32,7 @@ #if 1 + static const FT_UShort cff_isoadobe_charset_length = 229; static const FT_UShort cff_isoadobe_charset[229] = { 0, 1, 2, 3, 4, 5, 6, 7, @@ -65,6 +66,7 @@ 224, 225, 226, 227, 228 }; + static const FT_UShort cff_expert_charset_length = 166; static const FT_UShort cff_expert_charset[166] = { 0, 1, 229, 230, 231, 232, 233, 234, @@ -90,6 +92,7 @@ 373, 374, 375, 376, 377, 378 }; + static const FT_UShort cff_expertsubset_charset_length = 87; static const FT_UShort cff_expertsubset_charset[87] = { 0, 1, 231, 232, 235, 236, 237, 238, @@ -105,6 +108,7 @@ 340, 341, 342, 343, 344, 345, 346 }; + static const FT_UShort cff_standard_encoding_length = 256; static const FT_UShort cff_standard_encoding[256] = { 0, 0, 0, 0, 0, 0, 0, 0, @@ -141,6 +145,7 @@ 146, 147, 148, 149, 0, 0, 0, 0 }; + static const FT_UShort cff_expert_encoding_length = 256; static const FT_UShort cff_expert_encoding[256] = { 0, 0, 0, 0, 0, 0, 0, 0, @@ -179,6 +184,33 @@ #endif /* 1 */ + FT_EXPORT_DEF( const FT_UShort* ) + cff_get_predefined_table( cff_predefined_table table ) + { + switch( table ) + { + case cff_predefined_table_standard_encoding: return cff_standard_encoding; + case cff_predefined_table_expert_encoding: return cff_expert_encoding; + case cff_predefined_table_isoadobe_charset: return cff_isoadobe_charset; + case cff_predefined_table_expert_charset: return cff_expert_charset; + case cff_predefined_table_expertsubset_charset: return cff_expertsubset_charset; + } + return (const FT_UShort*) 0; + } + + FT_EXPORT_DEF( const FT_UShort ) + cff_get_predefined_table_length( cff_predefined_table table ) + { + switch( table ) + { + case cff_predefined_table_standard_encoding: return cff_standard_encoding_length; + case cff_predefined_table_expert_encoding: return cff_expert_encoding_length; + case cff_predefined_table_isoadobe_charset: return cff_isoadobe_charset_length; + case cff_predefined_table_expert_charset: return cff_expert_charset_length; + case cff_predefined_table_expertsubset_charset: return cff_expertsubset_charset_length; + } + return 0; + } FT_LOCAL_DEF( FT_UShort ) cff_get_standard_encoding( FT_UInt charcode ) diff -u -r /Depot/Perforce/all/moduledev/3rdParty/FreeType/Released/2.3.11/FreeType/src/cff/cffload.h /Depot/Perforce/PDFActionsRegressionTester_Main/scc/FreeType/src/cff/cffload.h --- /Depot/Perforce/all/moduledev/3rdParty/FreeType/Released/2.3.11/FreeType/src/cff/cffload.h 2009-10-23 09:37:06.000000000 +0200 +++ /Depot/Perforce/PDFActionsRegressionTester_Main/scc/FreeType/src/cff/cffload.h 2009-11-17 11:03:22.000000000 +0100 @@ -58,7 +58,7 @@ FT_LOCAL( FT_Error ) - cff_font_load( FT_Library library, + cff_font_load( FT_Library library, FT_Stream stream, FT_Int face_index, CFF_Font font, @@ -73,6 +73,22 @@ FT_UInt glyph_index ); + typedef enum cff_predefined_table_ + { + cff_predefined_table_standard_encoding, + cff_predefined_table_expert_encoding, + cff_predefined_table_isoadobe_charset, + cff_predefined_table_expert_charset, + cff_predefined_table_expertsubset_charset + + } cff_predefined_table; + + FT_EXPORT( const FT_UShort* ) + cff_get_predefined_table( cff_predefined_table table ); + + FT_EXPORT( const FT_UShort ) + cff_get_predefined_table_length( cff_predefined_table table ); + FT_END_HEADER #endif /* __CFFLOAD_H__ */ diff -u -r /Depot/Perforce/all/moduledev/3rdParty/FreeType/Released/2.3.11/FreeType/src/cff/cffparse.c /Depot/Perforce/PDFActionsRegressionTester_Main/scc/FreeType/src/cff/cffparse.c --- /Depot/Perforce/all/moduledev/3rdParty/FreeType/Released/2.3.11/FreeType/src/cff/cffparse.c 2009-10-23 09:37:06.000000000 +0200 +++ /Depot/Perforce/PDFActionsRegressionTester_Main/scc/FreeType/src/cff/cffparse.c 2009-11-17 10:38:57.000000000 +0100 @@ -365,7 +365,7 @@ /* read a number, either integer or real */ - static FT_Long + FT_EXPORT_DEF( FT_Long ) cff_parse_num( FT_Byte** d ) { return **d == 30 ? ( cff_parse_real( d[0], d[1], 0, NULL ) >> 16 ) @@ -374,7 +374,7 @@ /* read a floating point number, either integer or real */ - static FT_Fixed + FT_EXPORT_DEF( FT_Fixed ) cff_parse_fixed( FT_Byte** d ) { return **d == 30 ? cff_parse_real( d[0], d[1], 0, NULL ) diff -u -r /Depot/Perforce/all/moduledev/3rdParty/FreeType/Released/2.3.11/FreeType/src/cff/cffparse.h /Depot/Perforce/PDFActionsRegressionTester_Main/scc/FreeType/src/cff/cffparse.h --- /Depot/Perforce/all/moduledev/3rdParty/FreeType/Released/2.3.11/FreeType/src/cff/cffparse.h 2009-10-23 09:37:06.000000000 +0200 +++ /Depot/Perforce/PDFActionsRegressionTester_Main/scc/FreeType/src/cff/cffparse.h 2009-11-17 10:39:50.000000000 +0100 @@ -92,6 +92,13 @@ } CFF_Field_Handler; + /* read a number, either integer or real, d[0] is start, d]1] is limit */ + FT_EXPORT( FT_Long ) + cff_parse_num( FT_Byte** d ); + + /* read a number, either integer or real, d[0] is start, d]1] is limit */ + FT_EXPORT( FT_Fixed ) + cff_parse_fixed( FT_Byte** d ); FT_END_HEADER