[EGIT] [core/enlightenment] master 05/06: slightly simplify image data setting in e_comp_object_render()

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

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

commit 881ccfc7685ea0683af59c9c8c87198c910d9095
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Apr 21 18:09:18 2016 -0400

    slightly simplify image data setting in e_comp_object_render()
---
 src/bin/e_comp_object.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 690efff..95973b9 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -3807,9 +3807,7 @@ e_comp_object_render(Evas_Object *obj)
      {
         Eina_Bool alpha = e_pixmap_image_is_argb(cw->ec->pixmap);
 
-        it = NULL;
         pix = e_pixmap_image_data_get(cw->ec->pixmap);
-        evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix);
         evas_object_image_alpha_set(cw->obj, alpha);
         ret = EINA_TRUE;
         goto end;
@@ -3839,7 +3837,6 @@ e_comp_object_render(Evas_Object *obj)
                }
              RENDER_DEBUG("UPDATE [%p] %i %i %ix%i", cw->ec, r->x, r->y, r->w, 
r->h);
           }
-        evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix);
         goto end;
      }
 
@@ -3866,15 +3863,15 @@ e_comp_object_render(Evas_Object *obj)
         e_pixmap_image_data_argb_convert(cw->ec->pixmap, pix, srcpix, r, 
stride);
         RENDER_DEBUG("UPDATE [%p]: %d %d %dx%d -- pix = %p", cw->ec, r->x, 
r->y, r->w, r->h, pix);
      }
-   evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix);
+   eina_iterator_free(it);
 end:
+   evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix);
    EINA_LIST_FOREACH(cw->obj_mirror, l, o)
      {
         evas_object_image_data_set(o, pix);
         evas_object_image_pixels_dirty_set(o, EINA_FALSE);
      }
 
-   eina_iterator_free(it);
    E_FREE_FUNC(cw->pending_updates, eina_tiler_free);
    if (ret)
      e_comp_client_post_update_add(cw->ec);

--