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:
extra paranoid checks for text ptr
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- evas_object_text.c 23 Jan 2004 07:53:08 -0000 1.22
+++ evas_object_text.c 6 May 2004 02:12:21 -0000 1.23
@@ -680,6 +680,9 @@
}
else
{
+ obj->cur.geometry.w = 0;
+ obj->cur.geometry.h = o->max_ascent + o->max_descent;
+ obj->cur.cache.geometry.validity = 0;
if (o->engine_data)
{
o->ascent =
obj->layer->evas->engine.func->font_ascent_get(obj->layer->evas->engine.data.output,
@@ -698,9 +701,6 @@
o->max_ascent = 0;
o->max_descent = 0;
}
- obj->cur.geometry.w = 0;
- obj->cur.geometry.h = o->max_ascent + o->max_descent;
- obj->cur.cache.geometry.validity = 0;
}
o->changed = 1;
evas_object_change(obj);
@@ -928,6 +928,7 @@
return 0;
MAGIC_CHECK_END();
if (!o->engine_data) return 0;
+ if (!o->cur.text) return 0;
return
obj->layer->evas->engine.func->font_inset_get(obj->layer->evas->engine.data.output,
o->engine_data,
o->cur.text);
@@ -952,6 +953,7 @@
return 0;
MAGIC_CHECK_END();
if (!o->engine_data) return 0;
+ if (!o->cur.text) return 0;
return
obj->layer->evas->engine.func->font_h_advance_get(obj->layer->evas->engine.data.output,
o->engine_data,
o->cur.text);
@@ -976,6 +978,7 @@
return 0;
MAGIC_CHECK_END();
if (!o->engine_data) return 0;
+ if (!o->cur.text) return o->ascent + o->descent;
return
obj->layer->evas->engine.func->font_v_advance_get(obj->layer->evas->engine.data.output,
o->engine_data,
o->cur.text);
@@ -1002,6 +1005,7 @@
return 0;
MAGIC_CHECK_END();
if (!o->engine_data) return 0;
+ if (!o->cur.text) return 0;
inset =
obj->layer->evas->engine.func->font_inset_get(obj->layer->evas->engine.data.output,
o->engine_data,
@@ -1056,6 +1060,7 @@
return -1;
MAGIC_CHECK_END();
if (!o->engine_data) return -1;
+ if (!o->cur.text) 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 Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson & Lucent use to
deliver higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
