Revert "evas: Deal with harfbuzz API breakage"
authortasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 17 Oct 2011 12:18:53 +0000 (12:18 +0000)
committertasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 17 Oct 2011 12:18:53 +0000 (12:18 +0000)
Sorry mate, but they broke API without bumping version, that's why I
didn't do this myself. You should probably add your version of harfbuzz.

This reverts commit 64057.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@64134 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/engines/common/evas_font_ot.c

index c3ba53f..3bd0c59 100644 (file)
@@ -283,19 +283,10 @@ 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) ?