projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
811058a
)
Evas text utils: move the non-ot function into the current ifdef.
author
Tom Hacohen
<tom@stosb.com>
Wed, 22 Apr 2015 12:11:52 +0000
(13:11 +0100)
committer
Tom Hacohen
<tom@stosb.com>
Wed, 22 Apr 2015 12:11:58 +0000
(13:11 +0100)
This function should only be build when OT is off. Move
it to the #else part of the ifdef.
src/lib/evas/common/evas_text_utils.c
patch
|
blob
|
history
diff --git
a/src/lib/evas/common/evas_text_utils.c
b/src/lib/evas/common/evas_text_utils.c
index dc2407fee49e19ca78db8a2d02a56734b97e85f2..bef21fe2883cad25bb0a091d8e278de7ae5dd894 100644
(file)
--- a/
src/lib/evas/common/evas_text_utils.c
+++ b/
src/lib/evas/common/evas_text_utils.c
@@
-409,8
+409,7
@@
_content_create_ot(RGBA_Font_Int *fi, const Eina_Unicode *text,
gl_itr++;
}
}
-#endif
-
+#else
static inline void
_content_create_regular(RGBA_Font_Int *fi, const Eina_Unicode *text,
Evas_Text_Props *text_props, const Evas_BiDi_Paragraph_Props *par_props,
@@
-516,6
+515,7
@@
_content_create_regular(RGBA_Font_Int *fi, const Eina_Unicode *text,
free(base_str);
# endif
}
+#endif
EAPI Eina_Bool
evas_common_text_props_content_create(void *_fi, const Eina_Unicode *text,