diff options
author | Matthias Clasen <mclasen@redhat.com> | 2019-09-03 01:36:45 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2019-09-03 01:36:45 +0000 |
commit | 5fe15f61d3c0c1e7b2e696696129f0f2f2b9a087 (patch) | |
tree | d08ff013a2a991d85ac2a2a507c3a9d7a90f0499 /pango/pango-layout.c | |
parent | 90b0789180744f440164a0bcb56e35a212dd22b7 (diff) | |
parent | 8ec0d2b23ab87cc686cffd2708d547c0ec7dcc85 (diff) | |
download | pango-5fe15f61d3c0c1e7b2e696696129f0f2f2b9a087.tar.gz |
Merge branch 'hyphen-crash' into 'master'
Drop some leftover code
Closes #418
See merge request GNOME/pango!144
Diffstat (limited to 'pango/pango-layout.c')
-rw-r--r-- | pango/pango-layout.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index adac80c6..2863894c 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -2992,8 +2992,7 @@ free_run (PangoLayoutRun *run, gpointer data) static PangoItem * uninsert_run (PangoLayoutLine *line) { - PangoLayout *layout = line->layout; - PangoLayoutRun *run, *prev; + PangoLayoutRun *run; PangoItem *item; GSList *tmp_node = line->runs; @@ -3004,18 +3003,6 @@ uninsert_run (PangoLayoutLine *line) line->runs = tmp_node->next; line->length -= item->length; - if (item->length == 2 && - strncmp (layout->text + run->item->offset, "\302\255", 2) == 0) - { - /* this is a hyphen run, add the SHY back - * to the previous item - */ - prev = line->runs->data; - item = prev->item; - item->length += 2; - item->num_chars += 1; - } - g_slist_free_1 (tmp_node); free_run (run, (gpointer)FALSE); |