summaryrefslogtreecommitdiff
path: root/src/psaux/cf2ft.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/psaux/cf2ft.c')
-rw-r--r--src/psaux/cf2ft.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/psaux/cf2ft.c b/src/psaux/cf2ft.c
index 7cc046480..7b7f72b66 100644
--- a/src/psaux/cf2ft.c
+++ b/src/psaux/cf2ft.c
@@ -649,10 +649,10 @@
return FT_THROW( Invalid_Glyph_Format );
}
- error = cff_get_glyph_data( decoder->builder.face,
- (CF2_UInt)gid,
- &charstring,
- &len );
+ error = decoder->get_glyph_callback( decoder->builder.face,
+ (CF2_UInt)gid,
+ &charstring,
+ &len );
/* TODO: for now, just pass the FreeType error through */
if ( error )
return error;
@@ -674,10 +674,9 @@
{
FT_ASSERT( decoder );
- //TODO(ewaldhew): needs to use func ptr too
- cff_free_glyph_data( decoder->builder.face,
- (FT_Byte**)&buf->start,
- (FT_ULong)( buf->end - buf->start ) );
+ decoder->free_glyph_callback( decoder->builder.face,
+ (FT_Byte**)&buf->start,
+ (FT_ULong)( buf->end - buf->start ) );
}