diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-31 21:07:40 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-31 21:07:40 +0000 |
| commit | 80dbd6ea6f37793109b0ab5bfd43bac811810481 (patch) | |
| tree | cefb099aba71c769dca55b54d5b87a54faf8db6b /pango/pango-layout.c | |
| parent | 1fedc11aa03d95e4e365f01796ecceca8b0acd0e (diff) | |
| parent | cc8ac2a10360027b334db8e4b237207540004ae7 (diff) | |
| download | pango-80dbd6ea6f37793109b0ab5bfd43bac811810481.tar.gz | |
Merge branch 'revert-1fedc11a' into 'master'
Revert "Merge branch 'fix-deadlocks' into 'master'"
See merge request GNOME/pango!311
Diffstat (limited to 'pango/pango-layout.c')
| -rw-r--r-- | pango/pango-layout.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 22924f88..1f86150e 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -5953,23 +5953,13 @@ 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: @@ -5986,8 +5976,6 @@ 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: |