[EGIT] [core/enlightenment] master 02/02: set NULL image data in _e_comp_object_pixels_get() on failure

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=b94023c412615ee26fb29e3d96bb5ef25ff800b8

commit b94023c412615ee26fb29e3d96bb5ef25ff800b8
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Apr 22 12:45:26 2016 -0400

    set NULL image data in _e_comp_object_pixels_get() on failure
    
    ensure that nothing is rendered here
---
 src/bin/e_comp_object.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index f340f22..61a768c 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -904,15 +904,18 @@ _e_comp_object_setup(E_Comp_Object *cw)
 
 /* for fast path evas rendering; only called during render */
 static void
-_e_comp_object_pixels_get(void *data, Evas_Object *obj EINA_UNUSED)
+_e_comp_object_pixels_get(void *data, Evas_Object *obj)
 {
    E_Comp_Object *cw = data;
    E_Client *ec = cw->ec;
    int pw, ph;
    int bx, by, bxx, byy;
 
-   if (!ec->pixmap) return;
-   if (!e_pixmap_size_get(ec->pixmap, &pw, &ph)) return;
+   if ((!ec->pixmap) || (!e_pixmap_size_get(ec->pixmap, &pw, &ph)))
+     {
+        evas_object_image_data_set(obj, NULL);
+        return;
+     }
    //INF("PIXEL GET %p: %dx%d || %dx%d", ec, ec->w, ec->h, pw, ph);
    e_pixmap_image_opaque_get(cw->ec->pixmap, &bx, &by, &bxx, &byy);
    if (bxx && byy)

--