summaryrefslogtreecommitdiff
path: root/include/freetype/internal/psaux.h
diff options
context:
space:
mode:
authorEwald Hew <ewaldhew@gmail.com>2017-09-25 06:10:20 +0200
committerWerner Lemberg <wl@gnu.org>2017-09-25 09:26:59 +0200
commit0589e3c01212fc77470ddde13d379a16170af151 (patch)
treea30f4d6aa40ce431b9699ee583af985ea165a94c /include/freetype/internal/psaux.h
parent43c015823f7c8a708205b3501a862b8f50809363 (diff)
downloadfreetype2-0589e3c01212fc77470ddde13d379a16170af151.tar.gz
Use the new objects.
* include/freetype/internal/psaux.h, src/psaux/psauxmod.c: Fix switching between new and old engines. * src/cff/cffgload.c, src/cff/cffparse.c: Update calls. * src/psaux/psblues.c, src/psaux/psfont.c, src/psaux/psfont.h, src/psaux/psft.c, src/psaux/psft.h, src/psaux/psintrp.c: Update all to use new objects.
Diffstat (limited to 'include/freetype/internal/psaux.h')
-rw-r--r--include/freetype/internal/psaux.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 3361b9794..45013e482 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -1137,18 +1137,22 @@ FT_BEGIN_HEADER
CFF_Size size,
FT_UInt glyph_index );
- FT_Error
- (*parse_charstrings)( CFF_Decoder* decoder,
- FT_Byte* charstring_base,
- FT_ULong charstring_len
#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
-/*TODO(ewaldhew): seems hacky, is there a better way to do this?*/
- ,FT_Bool in_dict
+ FT_Error
+ (*parse_charstrings_old)( CFF_Decoder* decoder,
+ FT_Byte* charstring_base,
+ FT_ULong charstring_len,
+ FT_Bool in_dict );
#endif
- );
+
+ FT_Error
+ (*parse_charstrings)( PS_Decoder* decoder,
+ FT_Byte* charstring_base,
+ FT_ULong charstring_len );
} CFF_Decoder_FuncsRec;
+
/*************************************************************************/
/*************************************************************************/
/***** *****/