[pango/wip/chergert/bidi-temp-allocs: 13/13] Merge branch 'master' into 'wip/chergert/bidi-temp-allocs'

[Matthias Clasen <matthiasc src gnome org>]

commit d403624bf112a49991e903cfd236f0f1ff653cdf
Merge: 0814dec8 bd06f7b9
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jul 16 00:56:11 2018 +0000

    Merge branch 'master' into 'wip/chergert/bidi-temp-allocs'
    
    # Conflicts:
    #   pango/pango-bidi-type.c

 Makefile.am                                        |  4 +-
 configure.ac                                       |  2 +-
 meson.build                                        |  2 +-
 pango.pc.in                                        |  1 +
 pango/pango-bidi-type.c                            | 71 +++++++++++++++-
 pango/pango-ot-buffer.c                            |  1 -
 pango/pangofc-fontmap.c                            |  6 +-
 {pango-view => utils}/EMOJI-MODIFIERS.txt          |  0
 {pango-view => utils}/GLASS.txt                    |  0
 {pango-view => utils}/HELLO.txt                    |  0
 {pango-view => utils}/Makefile.am                  | 11 +++
 {pango-view => utils}/meson.build                  |  0
 utils/pango-list.c                                 | 98 ++++++++++++++++++++++
 {pango-view => utils}/pango-view.c                 |  0
 {pango-view => utils}/test-arabic.txt              |  0
 {pango-view => utils}/test-chinese.txt             |  0
 {pango-view => utils}/test-devanagari.txt          |  0
 {pango-view => utils}/test-feature-tag.markup      |  0
 {pango-view => utils}/test-font-variations.markup  |  0
 {pango-view => utils}/test-gurmukhi.txt            |  0
 {pango-view => utils}/test-hebrew.txt              |  0
 {pango-view => utils}/test-ipa.txt                 |  0
 {pango-view => utils}/test-justify.txt             |  0
 {pango-view => utils}/test-lao.txt                 |  0
 {pango-view => utils}/test-latin.txt               |  0
 {pango-view => utils}/test-long-paragraph.txt      |  0
 {pango-view => utils}/test-mixed.markup            |  0
 {pango-view => utils}/test-mixed.txt               |  0
 {pango-view => utils}/test-mongolian.txt           |  0
 {pango-view => utils}/test-nko.txt                 |  0
 .../test-opentype-language.markup                  |  0
 {pango-view => utils}/test-syriac.txt              |  0
 {pango-view => utils}/test-tamil.txt               |  0
 {pango-view => utils}/test-thai.txt                |  0
 {pango-view => utils}/test-tibetan.txt             |  0
 {pango-view => utils}/viewer-cairo.c               |  0
 {pango-view => utils}/viewer-cairo.h               |  0
 {pango-view => utils}/viewer-main.c                |  0
 {pango-view => utils}/viewer-pangocairo.c          |  0
 {pango-view => utils}/viewer-pangoft2.c            |  0
 {pango-view => utils}/viewer-pangoxft.c            |  0
 {pango-view => utils}/viewer-render.c              |  0
 {pango-view => utils}/viewer-render.h              |  0
 {pango-view => utils}/viewer-x.c                   |  0
 {pango-view => utils}/viewer-x.h                   |  0
 {pango-view => utils}/viewer.h                     |  1 -
 46 files changed, 185 insertions(+), 12 deletions(-)
---
diff --cc pango/pango-bidi-type.c
index 782f60f2,68f59a97..19a40dae
--- a/pango/pango-bidi-type.c
+++ b/pango/pango-bidi-type.c
@@@ -132,13 -134,13 +134,15 @@@ pango_log2vis_get_embedding_levels (con
    guint8 *embedding_levels_list;
    const gchar *p;
    FriBidiParType fribidi_base_dir;
 -  FriBidiCharType *bidi_types;
 +  FriBidiCharType local_bidi_types[128];
 +  FriBidiCharType *bidi_types = local_bidi_types;
  #ifdef USE_FRIBIDI_EX_API
 -  FriBidiBracketType *bracket_types;
 +  FriBidiBracketType local_bracket_types[128];
 +  FriBidiBracketType *bracket_types = local_bracket_types;
  #endif
    FriBidiLevel max_level;
+   FriBidiCharType ored_types = 0;
+   FriBidiCharType anded_strongs = FRIBIDI_TYPE_RLE;
  
    G_STATIC_ASSERT (sizeof (FriBidiLevel) == sizeof (guint8));
    G_STATIC_ASSERT (sizeof (FriBidiChar) == sizeof (gunichar));
@@@ -202,13 -256,9 +263,12 @@@
                                                (FriBidiLevel*)embedding_levels_list);
  #endif
  
 +  if (bidi_types != local_bidi_types)
 +    g_free (bidi_types);
 +
    if (G_UNLIKELY(max_level == 0))
      {
-       /* fribidi_get_par_embedding_levels() failed,
-        * is this the best thing to do? */
+       /* fribidi_get_par_embedding_levels() failed. */
        memset (embedding_levels_list, 0, length);
      }