Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_text.c
Log Message:
dont segv if font wasnt loaded and we query
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- evas_object_text.c 18 Oct 2003 03:34:00 -0000 1.18
+++ evas_object_text.c 29 Oct 2003 00:22:46 -0000 1.19
@@ -805,6 +805,7 @@
MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
return 0;
MAGIC_CHECK_END();
+ if (!o->engine_data) return 0;
return
obj->layer->evas->engine.func->font_inset_get(obj->layer->evas->engine.data.output,
o->engine_data,
o->cur.text);
@@ -828,6 +829,7 @@
MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
return 0;
MAGIC_CHECK_END();
+ if (!o->engine_data) return 0;
return
obj->layer->evas->engine.func->font_h_advance_get(obj->layer->evas->engine.data.output,
o->engine_data,
o->cur.text);
@@ -851,6 +853,7 @@
MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
return 0;
MAGIC_CHECK_END();
+ if (!o->engine_data) return 0;
return
obj->layer->evas->engine.func->font_v_advance_get(obj->layer->evas->engine.data.output,
o->engine_data,
o->cur.text);
@@ -876,6 +879,7 @@
MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
return 0;
MAGIC_CHECK_END();
+ if (!o->engine_data) return 0;
inset =
obj->layer->evas->engine.func->font_inset_get(obj->layer->evas->engine.data.output,
o->engine_data,
@@ -929,6 +933,7 @@
MAGIC_CHECK(o, Evas_Object_Text, MAGIC_OBJ_TEXT);
return -1;
MAGIC_CHECK_END();
+ if (!o->engine_data) return -1;
inset =
obj->layer->evas->engine.func->font_inset_get(obj->layer->evas->engine.data.output,
o->engine_data,
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
