aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/cid/cidobjs.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-06-26 09:53:21 +0200
committermarha <marha@users.sourceforge.net>2014-06-26 09:53:21 +0200
commit90137f4c5e30b1c6f9a262e8c853494540dad2d7 (patch)
tree7da9d06a291a853f0d17b2ee49a2d31d86a5d757 /freetype/src/cid/cidobjs.c
parentd47db8d4713de42ccca071c9e8401fc7a213ed49 (diff)
parentfba3b6d1979c1d1ad0d56d46fc2d787f111c07fb (diff)
downloadvcxsrv-90137f4c5e30b1c6f9a262e8c853494540dad2d7.tar.gz
vcxsrv-90137f4c5e30b1c6f9a262e8c853494540dad2d7.tar.bz2
vcxsrv-90137f4c5e30b1c6f9a262e8c853494540dad2d7.zip
Merge remote-tracking branch 'origin/released'
* origin/released: Updated to freetype 2.5.3
Diffstat (limited to 'freetype/src/cid/cidobjs.c')
-rw-r--r--freetype/src/cid/cidobjs.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/freetype/src/cid/cidobjs.c b/freetype/src/cid/cidobjs.c
index 145d62998..41bd735f6 100644
--- a/freetype/src/cid/cidobjs.c
+++ b/freetype/src/cid/cidobjs.c
@@ -355,9 +355,10 @@
cidface->num_charmaps = 0;
cidface->face_index = face_index;
- cidface->face_flags = FT_FACE_FLAG_SCALABLE | /* scalable outlines */
- FT_FACE_FLAG_HORIZONTAL | /* horizontal data */
- FT_FACE_FLAG_HINTER; /* has native hinter */
+
+ cidface->face_flags |= FT_FACE_FLAG_SCALABLE | /* scalable outlines */
+ FT_FACE_FLAG_HORIZONTAL | /* horizontal data */
+ FT_FACE_FLAG_HINTER; /* has native hinter */
if ( info->is_fixed_pitch )
cidface->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;