diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-29 18:08:19 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-29 18:08:19 +0000 |
| commit | 5ccc0c7aa5de2667a5e0da8c35387eb662c3edff (patch) | |
| tree | 649b79262f0906cd9bc3077c523960b5b9fe7c8e | |
| parent | 296317f2d0d628f2104168de3dc55458ed7f853a (diff) | |
| parent | f29436d34a8d22b3dd7dbfa2d3c5c2b52a50ee82 (diff) | |
| download | pango-5ccc0c7aa5de2667a5e0da8c35387eb662c3edff.tar.gz | |
Merge branch 'misc-speedups2' into 'master'
Misc speedups2
See merge request GNOME/pango!307
| -rwxr-xr-x | .gitlab-ci/run-tests.sh | 2 | ||||
| -rw-r--r-- | pango/break.c | 17 | ||||
| -rw-r--r-- | pango/pango-bidi-type.c | 12 |
3 files changed, 13 insertions, 18 deletions
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index 408a4a18..d82f1d08 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -7,7 +7,7 @@ srcdir=$( pwd ) builddir=$1 # Ignore memory leaks lower in dependencies -export LSAN_OPTIONS=fast_unwind_on_malloc=0:suppressions=$srcdir/lsan.supp:print_suppressions=0 +export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0 # Check leaks of slices export G_SLICE=always-malloc diff --git a/pango/break.c b/pango/break.c index 35b947c0..fadf01d0 100644 --- a/pango/break.c +++ b/pango/break.c @@ -502,9 +502,7 @@ pango_default_break (const gchar *text, else if (GB_type == GB_InHangulSyllable) is_grapheme_boundary = FALSE; /* Rules GB6, GB7, GB8 */ else if (GB_type == GB_Extend) - { - is_grapheme_boundary = FALSE; /* Rule GB9 */ - } + is_grapheme_boundary = FALSE; /* Rule GB9 */ else if (GB_type == GB_ZWJ) is_grapheme_boundary = FALSE; /* Rule GB9 */ else if (GB_type == GB_SpacingMark) @@ -641,14 +639,12 @@ pango_default_break (const gchar *text, if (wc >= 0x24B6 && wc <= 0x24E9) /* Other_Alphabetic */ goto Alphabetic; - if (G_UNLIKELY(wc >=0x1F1E6 && wc <=0x1F1FF)) + if (G_UNLIKELY(wc >= 0x1F1E6 && wc <= 0x1F1FF)) { - if (prev_WB_type == WB_RI_Odd) - WB_type = WB_RI_Even; - else if (prev_WB_type == WB_RI_Even) - WB_type = WB_RI_Odd; - else - WB_type = WB_RI_Odd; + if (prev_WB_type == WB_RI_Odd) + WB_type = WB_RI_Even; + else + WB_type = WB_RI_Odd; } break; @@ -1563,7 +1559,6 @@ pango_default_break (const gchar *text, attrs[i].is_line_break = TRUE; /* Rule LB3 */ attrs[0].is_line_break = FALSE; /* Rule LB2 */ - } static gboolean diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c index b86affba..01da86d3 100644 --- a/pango/pango-bidi-type.c +++ b/pango/pango-bidi-type.c @@ -273,8 +273,8 @@ resolved: * * This function is useful to categorize characters into left-to-right * letters, right-to-left letters, and everything else. If full Unicode - * bidirectional type of a character is needed, [type_func@Pango.BidiType.for_unichar] - * can be used instead. + * bidirectional type of a character is needed, + * [type_func@Pango.BidiType.for_unichar] can be used instead. * * Return value: the direction of the character. */ @@ -305,12 +305,12 @@ pango_unichar_direction (gunichar ch) * * Mirror characters are determined by the Unicode mirrored property. * - * Use g_unichar_get_mirror_char() instead; the docs for that function - * provide full details. - * * Return value: %TRUE if @ch has a mirrored character and @mirrored_ch is * filled in, %FALSE otherwise - **/ + * + * Deprecated: Use g_unichar_get_mirror_char() instead; the docs for that function + * provide full details. + */ gboolean pango_get_mirror_char (gunichar ch, gunichar *mirrored_ch) |