From: devilhorns <devilhorns@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Tue, 3 Jul 2012 07:23:17 +0000 (+0000)
Subject: Evas: Support harfbuzz version checking.
X-Git-Tag: submit/trunk/20120815.174732~144
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0821e59b20e765e5f7187698c506fb171b8553d;p=profile%2Fivi%2Fevas.git

Evas: Support harfbuzz version checking.

NB: Merged from Tizen to upstream EFL.



git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@73196 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/engines/common/evas_font_ot.c b/src/lib/engines/common/evas_font_ot.c
index 9ed92c7..3e22603 100644
--- a/src/lib/engines/common/evas_font_ot.c
+++ b/src/lib/engines/common/evas_font_ot.c
@@ -294,10 +294,19 @@ evas_common_font_ot_populate_text_props(const Eina_Unicode *text,
         slen = len;
      }
 
+#if HB_VERSION_CHECK(0,7,0)
+   buffer = hb_buffer_create(slen);
+#else
    buffer = hb_buffer_create();
+#endif
    hb_buffer_set_unicode_funcs(buffer, _evas_common_font_ot_unicode_funcs_get());
+#if HB_VERSION_CHECK(0,7,0)
+   hb_buffer_set_language(buffer, hb_language_from_string(
+            evas_common_language_from_locale_get()));
+#else
    hb_buffer_set_language(buffer, hb_language_from_string(
             evas_common_language_from_locale_get(), -1));
+#endif
    hb_buffer_set_script(buffer, _evas_script_to_harfbuzz[props->script]);
    hb_buffer_set_direction(buffer,
          (props->bidi.dir == EVAS_BIDI_DIRECTION_RTL) ?