From 03f3f8ab9e5bab63d925c7369a78d59b831896d7 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 13 May 2019 06:53:19 +0200 Subject: * src/psaux/psfont.c (cf2_font_setup): Fix compiler warning. --- ChangeLog | 4 ++++ src/psaux/psfont.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77766c41a..d392eba99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2019-05-13 Werner Lemberg + + * src/psaux/psfont.c (cf2_font_setup): Fix compiler warning. + 2019-05-12 Werner Lemberg [truetype] Doh. Fix last commit to make it work. diff --git a/src/psaux/psfont.c b/src/psaux/psfont.c index bb5faa38f..00e421081 100644 --- a/src/psaux/psfont.c +++ b/src/psaux/psfont.c @@ -274,9 +274,6 @@ if ( !font->isT1 ) { - FT_Service_CFFLoad cffload = (FT_Service_CFFLoad)font->cffload; - - /* check for variation vectors */ vstore = cf2_getVStore( decoder ); hasVariations = ( vstore->dataCount != 0 ); @@ -284,6 +281,9 @@ if ( hasVariations ) { #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT + FT_Service_CFFLoad cffload = (FT_Service_CFFLoad)font->cffload; + + /* check whether Private DICT in this subfont needs to be reparsed */ font->error = cf2_getNormalizedVector( decoder, &lenNormalizedV, -- cgit v1.2.1