diff options
| author | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-06-24 14:44:23 +0000 |
|---|---|---|
| committer | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-06-24 14:44:23 +0000 |
| commit | a826c98c3ade93fb2636af5f0ed1ab01d856681d (patch) | |
| tree | 46360f7010220d10c2bb098a78cca8dcf3335499 /navit/font | |
| parent | b003caed6e4d3af894d62078daa5f423280d0b85 (diff) | |
| download | navit-a826c98c3ade93fb2636af5f0ed1ab01d856681d.tar.gz | |
Fix:font/freetype:Fixed building with newer fribidi
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3395 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/font')
| -rw-r--r-- | navit/font/freetype/font_freetype.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/navit/font/freetype/font_freetype.c b/navit/font/freetype/font_freetype.c index ad407040b..9ea3fbd30 100644 --- a/navit/font/freetype/font_freetype.c +++ b/navit/font/freetype/font_freetype.c @@ -13,6 +13,9 @@ #endif #if USE_FRIBIDI #include <fribidi/fribidi.h> +#if FRIBIDI_INTERFACE_VERSION == 3 +#include <fribidi/fribidi-deprecated.h> +#endif #endif #include <freetype/ftglyph.h> #include "point.h" @@ -204,7 +207,7 @@ font_freetype_text_new(char *text, struct font_freetype_font *font, int dx, FriBidiChar visual_unicode_text[len+1]; int unicode_len = fribidi_utf8_to_unicode(text, strlen(text), unicode_text); FriBidiCharType base = FRIBIDI_TYPE_LTR; - fribidi_boolean fribidi_ret = fribidi_log2vis(unicode_text, unicode_len, &base, visual_unicode_text, NULL, NULL, NULL); + fribidi_log2vis(unicode_text, unicode_len, &base, visual_unicode_text, NULL, NULL, NULL); // TODO: check return value fribidi_unicode_to_utf8(visual_unicode_text, unicode_len, visual_text); p = visual_text; |