aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/type1/t1objs.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/type1/t1objs.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/type1/t1objs.c')
-rw-r--r--freetype/src/type1/t1objs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/freetype/src/type1/t1objs.c b/freetype/src/type1/t1objs.c
index 8cb552e3a..8289f31b5 100644
--- a/freetype/src/type1/t1objs.c
+++ b/freetype/src/type1/t1objs.c
@@ -364,10 +364,10 @@
root->num_glyphs = type1->num_glyphs;
root->face_index = 0;
- root->face_flags = FT_FACE_FLAG_SCALABLE |
- FT_FACE_FLAG_HORIZONTAL |
- FT_FACE_FLAG_GLYPH_NAMES |
- FT_FACE_FLAG_HINTER;
+ root->face_flags |= FT_FACE_FLAG_SCALABLE |
+ FT_FACE_FLAG_HORIZONTAL |
+ FT_FACE_FLAG_GLYPH_NAMES |
+ FT_FACE_FLAG_HINTER;
if ( info->is_fixed_pitch )
root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;