[EGIT] [core/efl] master 01/02: Evas.Image: Simplify logic (trivial change)

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=225b33451b1d659e87233028cc17e2f48e74e797

commit 225b33451b1d659e87233028cc17e2f48e74e797
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Thu Jul 2 15:41:06 2015 +0900

    Evas.Image: Simplify logic (trivial change)
---
 src/lib/evas/canvas/evas_object_image.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_image.c 
b/src/lib/evas/canvas/evas_object_image.c
index b0d1c05..aee6260 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1535,15 +1535,15 @@ _evas_image_alpha_set(Eo *eo_obj, Evas_Image_Data *o, 
Eina_Bool has_alpha)
         o->preloading = EINA_FALSE;
         ENFN->image_data_preload_cancel(ENDT, o->engine_data, eo_obj);
      }
-   if (((has_alpha) && (o->cur->has_alpha)) ||
-       ((!has_alpha) && (!o->cur->has_alpha)))
+
+   has_alpha = !!has_alpha;
+   if (has_alpha == o->cur->has_alpha)
      return;
-   if (o->cur->has_alpha != has_alpha)
-     {
-        EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
-          state_write->has_alpha = has_alpha;
-        EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
-     }
+
+   EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
+     state_write->has_alpha = has_alpha;
+   EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
+
    if (o->engine_data)
      {
         int stride = 0;

--