From 9e85f7e5b94d470e0639a6c37bbd9bc1dafcba67 Mon Sep 17 00:00:00 2001 From: Shaleen Jain Date: Sun, 25 Feb 2018 18:42:27 +0530 Subject: [PATCH] fribidi: update for version 1.0 Update functions deprecated in version 1.0 when building with release 1.0 and above. Signed-off-by: Thomas Guillem Gbp-Pq: Name 0002-fribidi-update-for-version-1.0.patch --- modules/text_renderer/freetype/text_layout.c | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c index 0379b29f..99e14d66 100644 --- a/modules/text_renderer/freetype/text_layout.c +++ b/modules/text_renderer/freetype/text_layout.c @@ -152,6 +152,9 @@ typedef struct paragraph_t #ifdef HAVE_FRIBIDI FriBidiCharType *p_types; +#if FRIBIDI_MAJOR_VERSION >= 1 + FriBidiBracketType *p_btypes; +#endif FriBidiLevel *p_levels; FriBidiStrIndex *pi_reordered_indices; FriBidiParType paragraph_type; @@ -290,6 +293,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter, #ifdef HAVE_FRIBIDI p_paragraph->p_levels = vlc_alloc( i_size, sizeof( *p_paragraph->p_levels ) ); p_paragraph->p_types = vlc_alloc( i_size, sizeof( *p_paragraph->p_types ) ); +#if FRIBIDI_MAJOR_VERSION >= 1 + p_paragraph->p_btypes = vlc_alloc( i_size, sizeof( *p_paragraph->p_btypes ) ); +#endif p_paragraph->pi_reordered_indices = vlc_alloc( i_size, sizeof( *p_paragraph->pi_reordered_indices ) ); @@ -323,6 +329,9 @@ error: #ifdef HAVE_FRIBIDI if( p_paragraph->p_levels ) free( p_paragraph->p_levels ); if( p_paragraph->p_types ) free( p_paragraph->p_types ); +#if FRIBIDI_MAJOR_VERSION >= 1 + if( p_paragraph->p_btypes ) free( p_paragraph->p_btypes ); +#endif if( p_paragraph->pi_reordered_indices ) free( p_paragraph->pi_reordered_indices ); #endif @@ -348,6 +357,9 @@ static void FreeParagraph( paragraph_t *p_paragraph ) #ifdef HAVE_FRIBIDI free( p_paragraph->pi_reordered_indices ); free( p_paragraph->p_types ); +#if FRIBIDI_MAJOR_VERSION >= 1 + free( p_paragraph->p_btypes ); +#endif free( p_paragraph->p_levels ); #endif @@ -360,10 +372,22 @@ static int AnalyzeParagraph( paragraph_t *p_paragraph ) fribidi_get_bidi_types( p_paragraph->p_code_points, p_paragraph->i_size, p_paragraph->p_types ); +#if FRIBIDI_MAJOR_VERSION >= 1 + fribidi_get_bracket_types( p_paragraph->p_code_points, + p_paragraph->i_size, + p_paragraph->p_types, + p_paragraph->p_btypes ); + fribidi_get_par_embedding_levels_ex( p_paragraph->p_types, + p_paragraph->p_btypes, + p_paragraph->i_size, + &p_paragraph->paragraph_type, + p_paragraph->p_levels ); +#else fribidi_get_par_embedding_levels( p_paragraph->p_types, p_paragraph->i_size, &p_paragraph->paragraph_type, p_paragraph->p_levels ); +#endif #ifdef HAVE_HARFBUZZ hb_unicode_funcs_t *p_funcs = hb_unicode_funcs_get_default(); -- 2.30.2