diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-31 20:39:20 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-31 20:39:20 +0000 |
| commit | 1fedc11aa03d95e4e365f01796ecceca8b0acd0e (patch) | |
| tree | ef449695d79e349dd05de8e6330dc4d291f5816f /pango/pango-layout.c | |
| parent | 379f38e0054e72b003f1d81a48b83fef7ffb5312 (diff) | |
| parent | 3aab7d85577d1aff46d7c7f131622cb73e9fe66a (diff) | |
| download | pango-1fedc11aa03d95e4e365f01796ecceca8b0acd0e.tar.gz | |
Merge branch 'fix-deadlocks' into 'master'
Fix deadlocks
See merge request GNOME/pango!310
Diffstat (limited to 'pango/pango-layout.c')
| -rw-r--r-- | pango/pango-layout.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 1f86150e..22924f88 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -5953,13 +5953,23 @@ pango_layout_get_item_properties (PangoItem *item, break; case PANGO_UNDERLINE_SINGLE: case PANGO_UNDERLINE_SINGLE_LINE: + case PANGO_UNDERLINE_SINGLE_DOTTED: + case PANGO_UNDERLINE_SINGLE_LINE_DOTTED: + case PANGO_UNDERLINE_SINGLE_DASHED: + case PANGO_UNDERLINE_SINGLE_LINE_DASHED: properties->uline_single = TRUE; break; case PANGO_UNDERLINE_DOUBLE: case PANGO_UNDERLINE_DOUBLE_LINE: + case PANGO_UNDERLINE_DOUBLE_DOTTED: + case PANGO_UNDERLINE_DOUBLE_LINE_DOTTED: + case PANGO_UNDERLINE_DOUBLE_DASHED: + case PANGO_UNDERLINE_DOUBLE_LINE_DASHED: properties->uline_double = TRUE; break; case PANGO_UNDERLINE_LOW: + case PANGO_UNDERLINE_LOW_DOTTED: + case PANGO_UNDERLINE_LOW_DASHED: properties->uline_low = TRUE; break; case PANGO_UNDERLINE_ERROR: @@ -5976,6 +5986,8 @@ pango_layout_get_item_properties (PangoItem *item, switch (((PangoAttrInt *)attr)->value) { case PANGO_OVERLINE_SINGLE: + case PANGO_OVERLINE_SINGLE_DASHED: + case PANGO_OVERLINE_SINGLE_DOTTED: properties->oline_single = TRUE; break; default: |