Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_image.c
Log Message:
fix xrender engnie to accept user-provided pixel data
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_image.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- evas_object_image.c 2 Oct 2005 15:15:44 -0000 1.29
+++ evas_object_image.c 3 Oct 2005 10:20:12 -0000 1.30
@@ -1494,7 +1494,7 @@
if (is_v != was_v)
{
updates = evas_object_render_pre_visible_change(updates, obj, is_v,
was_v);
- goto done;
+ if (!o->pixel_updates) goto done;
}
/* it's not visible - we accounted for it appearing or not so just abort */
if (!is_v) goto done;
@@ -1504,7 +1504,7 @@
if (obj->restack)
{
updates = evas_object_render_pre_prev_cur_add(updates, obj);
- goto done;
+ if (!o->pixel_updates) goto done;
}
/* if it changed color */
if ((obj->cur.color.r != obj->prev.color.r) ||
@@ -1513,7 +1513,7 @@
(obj->cur.color.a != obj->prev.color.a))
{
updates = evas_object_render_pre_prev_cur_add(updates, obj);
- goto done;
+ if (!o->pixel_updates) goto done;
}
if (o->changed)
{
@@ -1526,7 +1526,7 @@
)
{
updates = evas_object_render_pre_prev_cur_add(updates, obj);
- goto done;
+ if (!o->pixel_updates) goto done;
}
if ((o->cur.image.w != o->prev.image.w) ||
(o->cur.image.h != o->prev.image.h) ||
@@ -1534,7 +1534,7 @@
(o->cur.smooth_scale != o->prev.smooth_scale))
{
updates = evas_object_render_pre_prev_cur_add(updates, obj);
- goto done;
+ if (!o->pixel_updates) goto done;
}
if ((o->cur.border.l != o->prev.border.l) ||
(o->cur.border.r != o->prev.border.r) ||
@@ -1542,12 +1542,12 @@
(o->cur.border.b != o->prev.border.b))
{
updates = evas_object_render_pre_prev_cur_add(updates, obj);
- goto done;
+ if (!o->pixel_updates) goto done;
}
if (o->dirty_pixels)
{
updates = evas_object_render_pre_prev_cur_add(updates, obj);
- goto done;
+ if (!o->pixel_updates) goto done;
}
}
/* if it changed geometry - and obviously not visibility or color */
@@ -1581,7 +1581,7 @@
rl = evas_list_remove(rl, r);
updates = evas_list_append(updates, r);
}
- goto done;
+ if (!o->pixel_updates) goto done;
}
if (((obj->cur.geometry.x != obj->prev.geometry.x) ||
(obj->cur.geometry.y != obj->prev.geometry.y) ||
@@ -1590,7 +1590,7 @@
)
{
updates = evas_object_render_pre_prev_cur_add(updates, obj);
- goto done;
+ if (!o->pixel_updates) goto done;
}
if (o->changed)
{
@@ -1600,7 +1600,7 @@
(o->cur.fill.h != o->prev.fill.h))
{
updates = evas_object_render_pre_prev_cur_add(updates, obj);
- goto done;
+ if (!o->pixel_updates) goto done;
}
if ((o->cur.border.l == 0) &&
(o->cur.border.r == 0) &&
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
