aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/type1/t1load.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-10 16:12:27 +0100
committermarha <marha@users.sourceforge.net>2011-11-10 16:12:27 +0100
commit82e62cfbf79bc8c19946d034a0d5e14ce4fabb44 (patch)
tree16003af05805301a8a23d3ba0048e29eaf0fca73 /freetype/src/type1/t1load.c
parent7381bc7b9f63b2a6bf9ea9cbe04614adfc4b2369 (diff)
parentd783adea42f29bd7917929597ca1031b70587e1d (diff)
downloadvcxsrv-82e62cfbf79bc8c19946d034a0d5e14ce4fabb44.tar.gz
vcxsrv-82e62cfbf79bc8c19946d034a0d5e14ce4fabb44.tar.bz2
vcxsrv-82e62cfbf79bc8c19946d034a0d5e14ce4fabb44.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'freetype/src/type1/t1load.c')
-rw-r--r--freetype/src/type1/t1load.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/freetype/src/type1/t1load.c b/freetype/src/type1/t1load.c
index 3fe1edd80..dc241fc18 100644
--- a/freetype/src/type1/t1load.c
+++ b/freetype/src/type1/t1load.c
@@ -896,7 +896,7 @@
}
-#endif /* T1_CONFIG_OPTION_NO_MM_SUPPORT */
+#endif /* !T1_CONFIG_OPTION_NO_MM_SUPPORT */
@@ -2140,8 +2140,10 @@
}
}
}
+ else
+ face->len_buildchar = 0;
-#endif /* T1_CONFIG_OPTION_NO_MM_SUPPORT */
+#endif /* !T1_CONFIG_OPTION_NO_MM_SUPPORT */
/* now, propagate the subrs, charstrings, and glyphnames tables */
/* to the Type1 data */