Skip to content

Commit

Permalink
fribidi: update for version 1.0
Browse files Browse the repository at this point in the history
Update functions deprecated in version 1.0 when building with release 1.0 and
above.

Signed-off-by: Thomas Guillem <thomas@gllm.fr>
  • Loading branch information
shalzz authored and tguillem committed Feb 26, 2018
1 parent f391a2a commit 26e2d39
Showing 1 changed file with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions modules/text_renderer/freetype/text_layout.c
Expand Up @@ -153,6 +153,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;
Expand Down Expand Up @@ -361,6 +364,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 ) );

Expand Down Expand Up @@ -398,6 +404,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter,
#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
Expand All @@ -424,6 +433,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

Expand All @@ -436,10 +448,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();
Expand Down

0 comments on commit 26e2d39

Please sign in to comment.