Evas language: Split to script even if there's no Harfbuzz.

SVN revision: 59108
This commit is contained in:
Tom Hacohen 2011-05-02 09:27:56 +00:00
parent 5793e609a0
commit af53b3d4a9
1 changed files with 2 additions and 14 deletions

View File

@ -64,7 +64,6 @@ evas_common_language_script_end_of_run_get(const Eina_Unicode *str,
const Evas_BiDi_Paragraph_Props *bidi_props, size_t start, int len)
{
/* FIXME: Use the standard segmentation instead */
#ifdef OT_SUPPORT
Evas_Script_Type first = EVAS_SCRIPT_UNKNOWN;
int i;
for (i = 0 ; i < len ; i++, str++)
@ -83,7 +82,7 @@ evas_common_language_script_end_of_run_get(const Eina_Unicode *str,
break;
}
}
# ifdef BIDI_SUPPORT
#ifdef BIDI_SUPPORT
{
int bidi_end;
bidi_end = evas_bidi_end_of_run_get(bidi_props, start, len);
@ -92,21 +91,10 @@ evas_common_language_script_end_of_run_get(const Eina_Unicode *str,
i = (i < bidi_end) ? i : bidi_end;
}
}
# else
(void) bidi_props;
(void) start;
# endif
return (i < len) ? i : 0;
#elif defined(BIDI_SUPPORT)
(void) str;
return evas_bidi_end_of_run_get(bidi_props, start, len);
#else
(void) bidi_props;
(void) start;
(void) str;
(void) len;
return 0;
#endif
return (i < len) ? i : 0;
}
Evas_Script_Type