Evas font-engine: *text_props_script_set add parameter len.

SVN revision: 58616

diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c
index 1a6a43311e7aaf7863ee8cb8908d05fc0427f28c..fe751081e70b29023d7883f1fa4b2d34078c8823 100644 (file)
--- a/legacy/evas/src/lib/canvas/evas_object_text.c
+++ b/legacy/evas/src/lib/canvas/evas_object_text.c
@@ -475,7 +475,7 @@ _evas_object_text_item_new(Evas_Object *obj, Evas_Object_Text *o,
    eina_unicode_strncpy(it->text, str + pos, len);
    evas_common_text_props_bidi_set(&it->text_props, o->bidi_par_props,
          it->text_pos);
-   evas_common_text_props_script_set(&it->text_props, it->text);
+   evas_common_text_props_script_set(&it->text_props, it->text, len);
    if (o->engine_data)
      {
         ENFN->font_text_props_info_create(ENDT,

diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index b29ec4f53da00aebd88d60b6d9ea89b302818f7f..5c5cd360aaa72405a89c8e6af3ea73dd9778969b 100644 (file)
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -2779,7 +2779,7 @@ skip:
              evas_common_text_props_bidi_set(&ti->text_props,
                    ti->parent.text_node->bidi_props, ti->parent.text_pos);
              evas_common_text_props_script_set (&ti->text_props,
-                   ti->text);
+                   ti->text, tmp_len);
              if (ti->parent.format->font.font)
                {
                   c->ENFN->font_text_props_info_create(c->ENDT,
@@ -3224,7 +3224,7 @@ _layout_ellipsis_item_new(Ctxt *c, const Evas_Object_Textblock_Item *cur_it)
    evas_common_text_props_bidi_set(&ellip_ti->text_props,
          ellip_ti->parent.text_node->bidi_props, ellip_ti->parent.text_pos);
    evas_common_text_props_script_set (&ellip_ti->text_props,
-         ellip_ti->text);
+         ellip_ti->text, len);
    c->ENFN->font_text_props_info_create(c->ENDT,
          ellip_ti->parent.format->font.font,
          ellip_ti->text, &ellip_ti->text_props,

diff --git a/legacy/evas/src/lib/engines/common/evas_text_utils.c b/legacy/evas/src/lib/engines/common/evas_text_utils.c
index 23e32f610247d514ab5d491e6831dcb01e30c404..261024bde56d61283cd22cd66aa399bece3d0e59 100644 (file)
--- a/legacy/evas/src/lib/engines/common/evas_text_utils.c
+++ b/legacy/evas/src/lib/engines/common/evas_text_utils.c
@@ -26,9 +26,9 @@ evas_common_text_props_bidi_set(Evas_Text_Props *props,
 
 void
 evas_common_text_props_script_set(Evas_Text_Props *props,
-      const Eina_Unicode *str)
+      const Eina_Unicode *str, size_t len)
 {
-   props->script = evas_common_language_script_type_get(str);
+   props->script = evas_common_language_script_type_get(str, len);
 }
 
 void

diff --git a/legacy/evas/src/lib/engines/common/evas_text_utils.h b/legacy/evas/src/lib/engines/common/evas_text_utils.h
index d29d3eb632e2ccd451e15d3d33a8778ce7d8fa3e..1cddb95dfcf99aa652c18857c11a614d0edc853e 100644 (file)
--- a/legacy/evas/src/lib/engines/common/evas_text_utils.h
+++ b/legacy/evas/src/lib/engines/common/evas_text_utils.h
@@ -51,7 +51,7 @@ evas_common_text_props_bidi_set(Evas_Text_Props *props,
 
 void
 evas_common_text_props_script_set(Evas_Text_Props *props,
-      const Eina_Unicode *str);
+      const Eina_Unicode *str, size_t len);
 
 EAPI Eina_Bool
 evas_common_text_props_content_create(void *_fn, const Eina_Unicode *text,

diff --git a/legacy/evas/src/lib/engines/common/language/evas_language_utils.c b/legacy/evas/src/lib/engines/common/language/evas_language_utils.c
index 2bdd53ef4f3de1784c50721be83f2d2ee9cf72ca..f4a636ae0f03ea4719314a724022d8ac331f279e 100644 (file)
--- a/legacy/evas/src/lib/engines/common/language/evas_language_utils.c
+++ b/legacy/evas/src/lib/engines/common/language/evas_language_utils.c
@@ -101,11 +101,12 @@ evas_common_language_script_end_of_run_get(const Eina_Unicode *str,
 }
 
 Evas_Script_Type
-evas_common_language_script_type_get(const Eina_Unicode *str)
+evas_common_language_script_type_get(const Eina_Unicode *str, size_t len)
 {
    Evas_Script_Type script = EVAS_SCRIPT_COMMON;
+   const Eina_Unicode *end = str + len;
    /* Arabic is the first script in the array that's not a common/inherited */
-   for ( ; *str && ((script = evas_common_language_char_script_get(*str)) < EVAS_SCRIPT_ARABIC) ; str++)
+   for ( ; str < end && ((script = evas_common_language_char_script_get(*str)) < EVAS_SCRIPT_ARABIC) ; str++)
      ;
    return script;
 }

diff --git a/legacy/evas/src/lib/engines/common/language/evas_language_utils.h b/legacy/evas/src/lib/engines/common/language/evas_language_utils.h
index 0993fd68bdd0b5bf6c4720423ed3ee937a24df7d..10e5a76d700b342f1f2317b3e60dfcb52a9d8a7c 100644 (file)
--- a/legacy/evas/src/lib/engines/common/language/evas_language_utils.h
+++ b/legacy/evas/src/lib/engines/common/language/evas_language_utils.h
@@ -117,7 +117,7 @@ int
 evas_common_language_script_end_of_run_get(const Eina_Unicode *str, const Evas_BiDi_Paragraph_Props *bidi_props, size_t start, int len);
 
 Evas_Script_Type
-evas_common_language_script_type_get(const Eina_Unicode *str);
+evas_common_language_script_type_get(const Eina_Unicode *str, size_t len);
 
 Evas_Script_Type
 evas_common_language_char_script_get(Eina_Unicode unicode);