[vlc-commits] Freetype: Compatibility with Fribidi 0.10

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Feb 24 12:23:22 2011 +0100| [f2badf63a6b4884427c07eeb0a54210aec224f0b] | committer: Jean-Baptiste Kempf

Freetype: Compatibility with Fribidi 0.10

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f2badf63a6b4884427c07eeb0a54210aec224f0b
---

 modules/misc/freetype.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 1fa1b2b..ed6d9e8 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -1123,7 +1123,11 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
             }
             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;
+#endif
                 fribidi_log2vis((FriBidiChar*)psz_unicode + start_pos,
                                 pos - start_pos,
                                 &base_dir,
@@ -1809,7 +1813,11 @@ static int ProcessLines( filter_t *p_filter,
             }
             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;
+#endif
                 fribidi_log2vis((FriBidiChar*)psz_text + start_pos,
                         pos - start_pos, &base_dir,
                         (FriBidiChar*)p_fribidi_string + start_pos,