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:
patch from al catching nasty oops
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- evas_object_text.c 6 Jan 2006 23:05:17 -0000 1.50
+++ evas_object_text.c 14 Jan 2006 09:26:22 -0000 1.51
@@ -1243,18 +1243,33 @@
object->sub.col.a);
#define COLOR_SET(object, sub, col) \
- ENFN->context_color_set(output, context, \
+ if (obj->cur.clipper)\
+ ENFN->context_color_set(output, context, \
((int)object->sub.col.r *
((int)obj->cur.clipper->cur.cache.clip.r + 1)) >> 8, \
((int)object->sub.col.g *
((int)obj->cur.clipper->cur.cache.clip.g + 1)) >> 8, \
((int)object->sub.col.b *
((int)obj->cur.clipper->cur.cache.clip.b + 1)) >> 8, \
- ((int)object->sub.col.a *
((int)obj->cur.clipper->cur.cache.clip.a + 1)) >> 8);
+ ((int)object->sub.col.a *
((int)obj->cur.clipper->cur.cache.clip.a + 1)) >> 8); \
+ else\
+ ENFN->context_color_set(output, context, \
+ object->sub.col.r, \
+ object->sub.col.g, \
+ object->sub.col.b, \
+ object->sub.col.a);
#define COLOR_SET_AMUL(object, sub, col, amul) \
- ENFN->context_color_set(output, context, \
+ if (obj->cur.clipper) \
+ ENFN->context_color_set(output, context, \
((int)object->sub.col.r *
((int)obj->cur.clipper->cur.cache.clip.r + 1)) >> 8, \
((int)object->sub.col.g *
((int)obj->cur.clipper->cur.cache.clip.g + 1)) >> 8, \
((int)object->sub.col.b *
((int)obj->cur.clipper->cur.cache.clip.b + 1)) >> 8, \
- ((((int)object->sub.col.a *
((int)obj->cur.clipper->cur.cache.clip.a + 1)) >> 8) * amul) / 255);
+ ((((int)object->sub.col.a *
((int)obj->cur.clipper->cur.cache.clip.a + 1)) >> 8) * amul) / 255); \
+ else \
+ ENFN->context_color_set(output, context, \
+ object->sub.col.r, \
+ object->sub.col.g, \
+ object->sub.col.b, \
+ (((int)object->sub.col.a) * amul) / 255);
+
#define DRAW_TEXT(ox, oy) \
if ((o->engine_data) && (o->cur.text)) \
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
