diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-01-07 04:10:39 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-01-07 04:10:39 +0000 |
| commit | 3441513dae3c1993720b618fc705d2f8d2434c47 (patch) | |
| tree | 1819475dba8c06c92e0a373703b641f5040a6ca6 | |
| parent | 0f8931004fed4829b7a1c4b34c09c76b84b362d8 (diff) | |
| parent | cc404390f2cd0194becc1d1c8b475a619a1732d2 (diff) | |
| download | pango-3441513dae3c1993720b618fc705d2f8d2434c47.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
Avoid an uninitialized variable warning
Closes #650
See merge request GNOME/pango!573
| -rw-r--r-- | pango/pango-layout.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 973d2a7b..9167883c 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -4091,6 +4091,8 @@ process_item (PangoLayout *layout, return BREAK_ALL_FIT; } + wrap = layout->wrap; + if (!no_break_at_end && can_break_at (layout, state->start_offset + item->num_chars, wrap)) { @@ -4774,7 +4776,8 @@ pango_layout_check_lines (PangoLayout *layout) PangoAttrList *itemize_attrs; PangoAttrList *shape_attrs; PangoAttrIterator iter; - PangoDirection prev_base_dir = PANGO_DIRECTION_NEUTRAL, base_dir = PANGO_DIRECTION_NEUTRAL; + PangoDirection prev_base_dir = PANGO_DIRECTION_NEUTRAL; + PangoDirection base_dir = PANGO_DIRECTION_NEUTRAL; ParaBreakState state; gboolean need_log_attrs; |