Skip to content

V
vlc-2-2
Commit f2badf63 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Freetype: Compatibility with Fribidi 0.10

parent 4bbf2d42
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
modules/misc/freetype.c
View file @ f2badf63
...@@ -1123,7 +1123,11 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -1123,7 +1123,11 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
} }
if (pos > start_pos) if (pos > start_pos)
{ {
#if (FRIBIDI_MINOR_VERSION < 19) && (FRIBIDI_MAJOR_VERSION == 0)
FriBidiCharType base_dir = FRIBIDI_TYPE_LTR;
#else
FriBidiParType base_dir = FRIBIDI_PAR_LTR; FriBidiParType base_dir = FRIBIDI_PAR_LTR;
#endif
fribidi_log2vis((FriBidiChar*)psz_unicode + start_pos, fribidi_log2vis((FriBidiChar*)psz_unicode + start_pos,
pos - start_pos, pos - start_pos,
&base_dir, &base_dir,
...@@ -1809,7 +1813,11 @@ static int ProcessLines( filter_t *p_filter, ...@@ -1809,7 +1813,11 @@ static int ProcessLines( filter_t *p_filter,
} }
if (pos > start_pos) if (pos > start_pos)
{ {
#if (FRIBIDI_MINOR_VERSION < 19) && (FRIBIDI_MAJOR_VERSION == 0)
FriBidiCharType base_dir = FRIBIDI_TYPE_LTR;
#else
FriBidiParType base_dir = FRIBIDI_PAR_LTR; FriBidiParType base_dir = FRIBIDI_PAR_LTR;
#endif
fribidi_log2vis((FriBidiChar*)psz_text + start_pos, fribidi_log2vis((FriBidiChar*)psz_text + start_pos,
pos - start_pos, &base_dir, pos - start_pos, &base_dir,
(FriBidiChar*)p_fribidi_string + start_pos, (FriBidiChar*)p_fribidi_string + start_pos,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment