From c0bb73c775787ae1221efacc8d5d7a01a28320af Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Thu, 25 Jul 2013 12:31:45 +0900
Subject: [PATCH] evas/cserve2: Fix image load premultiplication

There was a color problem in elementary_test since elm
sets premul to 0 while expedite sets it to 1 during image load.
---
 src/bin/evas/evas_cserve2_slave.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/evas/evas_cserve2_slave.c b/src/bin/evas/evas_cserve2_slave.c
index a5a407bd61..5f9bc3246c 100644
--- a/src/bin/evas/evas_cserve2_slave.c
+++ b/src/bin/evas/evas_cserve2_slave.c
@@ -459,7 +459,7 @@ image_load(const char *file, const char *key, const char *shmfile,
    result->w = property.w;
    result->h = property.h;
 
-   if (property.alpha)
+   if (property.alpha && property.premul)
      {
         result->alpha_sparse = evas_cserve2_image_premul_data((unsigned int *) map,
                                                               result->w * result->h);