[EGIT] [core/efl] master 01/02: Eet: Another ETC decoding fix

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3f264677fbda54ad5e55996b1d9f5ad5bc3f4f8c

commit 3f264677fbda54ad5e55996b1d9f5ad5bc3f4f8c
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Thu Oct 29 21:05:03 2015 +0900

    Eet: Another ETC decoding fix
    
    @fix
---
 src/lib/eet/eet_image.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c
index 95b9ee2..2702fcd 100644
--- a/src/lib/eet/eet_image.c
+++ b/src/lib/eet/eet_image.c
@@ -618,7 +618,8 @@ eet_data_image_etc2_decode(const void *data,
                   break;
                }
           }
-        if (!found) goto on_error;
+        if (!found && (cspace != EMILE_COLORSPACE_ARGB8888))
+          goto on_error;
      }
 
    switch (cspace)
@@ -639,7 +640,7 @@ eet_data_image_etc2_decode(const void *data,
          if (lossy != EET_IMAGE_ETC1_ALPHA) goto on_error;
          if (alpha != EINA_TRUE) goto on_error;
          break;
-      case EET_COLORSPACE_ARGB8888:
+      case EMILE_COLORSPACE_ARGB8888:
          break;
       default:
          goto on_error;
@@ -651,7 +652,7 @@ eet_data_image_etc2_decode(const void *data,
      goto on_error;
 
    // TODO: Add support for more unpremultiplied modes (ETC2)
-   if ((cspace == EET_COLORSPACE_ARGB8888) && !prop.premul)
+   if ((cspace == EMILE_COLORSPACE_ARGB8888) && !prop.premul)
      _eet_argb_premul(p, prop.w * prop.h);
 
    r = 1;

--