summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2019-05-13 06:53:19 +0200
committerWerner Lemberg <wl@gnu.org>2019-05-13 06:53:19 +0200
commit03f3f8ab9e5bab63d925c7369a78d59b831896d7 (patch)
tree1d38202981c308a903e561266eee2b1738fbfd20
parent94ebc248653ede802b2bfbf6219e17f487fab3ff (diff)
downloadfreetype2-03f3f8ab9e5bab63d925c7369a78d59b831896d7.tar.gz
* src/psaux/psfont.c (cf2_font_setup): Fix compiler warning.
-rw-r--r--ChangeLog4
-rw-r--r--src/psaux/psfont.c6
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 <wl@gnu.org>
+
+ * src/psaux/psfont.c (cf2_font_setup): Fix compiler warning.
+
2019-05-12 Werner Lemberg <wl@gnu.org>
[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,