summaryrefslogtreecommitdiff
path: root/src/winfonts
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2013-12-25 08:50:50 +0100
committerWerner Lemberg <wl@gnu.org>2013-12-25 08:50:50 +0100
commit5f577462bd7cc8e2ca6fe4a1efecee6d8a95e7be (patch)
treedc5437844b517cb69ef7a2d27ead2911d94d1747 /src/winfonts
parentc7b55a3473f407f1783e37cf9117c26fd9ae0b9c (diff)
downloadfreetype2-5f577462bd7cc8e2ca6fe4a1efecee6d8a95e7be.tar.gz
Fix Savannah bug #40997.
* src/bdf/bdfdrivr.c (BDF_Face_Init): Only use OR operator to adjust face flags since FT_FACE_FLAG_EXTERNAL_STREAM might already be set. * src/cff/cffobjs.c (cff_face_init): Ditto. * src/cid/cidobjs.c (cid_face_init): Ditto. * src/pcf/pcfread.c (pcf_load_font): Ditto. * src/pfr/pfrobjs.c (pfr_face_init): Ditto. * src/type1/t1objs.c (T1_Face_Init): Ditto. * src/type42/t42objs.c (T42_Face_Init): Ditto. * src/winfonts/winfnt.c (FNT_Face_Init): Ditto.
Diffstat (limited to 'src/winfonts')
-rw-r--r--src/winfonts/winfnt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 68432438b..fd6fc557f 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -743,8 +743,8 @@
root->face_index = face_index;
- root->face_flags = FT_FACE_FLAG_FIXED_SIZES |
- FT_FACE_FLAG_HORIZONTAL;
+ root->face_flags |= FT_FACE_FLAG_FIXED_SIZES |
+ FT_FACE_FLAG_HORIZONTAL;
if ( font->header.avg_width == font->header.max_width )
root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;