diff options
Diffstat (limited to 'src/cff/cffgload.c')
| -rw-r--r-- | src/cff/cffgload.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 4047391c6..c27f74c3f 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -25,10 +25,10 @@ #include FT_OUTLINE_H #include FT_CFF_DRIVER_H -#include "cffobjs.h" #include "cffload.h" #include "cffgload.h" +#include FT_INTERNAL_CFF_OBJECTS_TYPES_H #include "cfferrs.h" @@ -143,7 +143,7 @@ FT_Int glyph_index; CFF_Font cff = (CFF_Font)face->other; - PSAux_Service psaux = cff->psaux; + PSAux_Service psaux = (PSAux_Service)face->psaux; const CFF_Decoder_Funcs decoder_funcs = psaux->cff_decoder_funcs; *max_advance = 0; @@ -203,7 +203,7 @@ FT_Bool hinting, scaled, force_scaling; CFF_Font cff = (CFF_Font)face->extra.data; - PSAux_Service psaux = cff->psaux; + PSAux_Service psaux = face->psaux; const CFF_Decoder_Funcs decoder_funcs = psaux->cff_decoder_funcs; FT_Matrix font_matrix; @@ -404,7 +404,7 @@ decoder_funcs->init( &decoder, face, size, glyph, hinting, - FT_LOAD_TARGET_MODE( load_flags ) + FT_LOAD_TARGET_MODE( load_flags ), cff_get_glyph_data, cff_free_glyph_data ); @@ -490,7 +490,7 @@ Glyph_Build_Finished: /* save new glyph tables, if no error */ if ( !error ) - cff_builder_done( &decoder.builder ); + decoder.builder.funcs.done( &decoder.builder ); /* XXX: anything to do for broken glyph entry? */ } |