diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-01-02 01:55:51 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-01-02 01:55:51 +0000 |
| commit | 957f267bd9c5b1fa19eb0b99e2cd9e064ca6e0c0 (patch) | |
| tree | 7969affe5eb3eba7222292d7fd67be2869bf4e5a /pango/fonts.c | |
| parent | d8b05c154f40f332785239fb292ea09caa4dfb1b (diff) | |
| download | pango-957f267bd9c5b1fa19eb0b99e2cd9e064ca6e0c0.tar.gz | |
Update the field mask in the merged description.
Tue Jan 1 20:52:00 2002 Owen Taylor <otaylor@redhat.com>
* pango/fonts.c (pango_font_description_merge[_static]):
Update the field mask in the merged description.
Diffstat (limited to 'pango/fonts.c')
| -rw-r--r-- | pango/fonts.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index e693605e..2f7c85aa 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -443,6 +443,8 @@ pango_font_description_merge (PangoFontDescription *desc, desc->stretch = desc_to_merge->stretch; if (new_mask & PANGO_FONT_MASK_SIZE) desc->size = desc_to_merge->size; + + desc->mask |= new_mask; } /** @@ -484,6 +486,8 @@ pango_font_description_merge_static (PangoFontDescription *desc, desc->stretch = desc_to_merge->stretch; if (new_mask & PANGO_FONT_MASK_SIZE) desc->size = desc_to_merge->size; + + desc->mask |= new_mask; } static gint |