summaryrefslogtreecommitdiff
path: root/src/lib/eet
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-10-29 21:05:03 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-10-29 21:06:16 +0900
commit3f264677fbda54ad5e55996b1d9f5ad5bc3f4f8c (patch)
tree6f6673ae91eaa1015d0aa899ec3904b3b79427d0 /src/lib/eet
parentcc5cccc511a3823bf328772e7b7ef9cfa852af54 (diff)
Eet: Another ETC decoding fix
@fix
Diffstat (limited to 'src/lib/eet')
-rw-r--r--src/lib/eet/eet_image.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c
index 95b9ee21de..2702fcd150 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,
618 break; 618 break;
619 } 619 }
620 } 620 }
621 if (!found) goto on_error; 621 if (!found && (cspace != EMILE_COLORSPACE_ARGB8888))
622 goto on_error;
622 } 623 }
623 624
624 switch (cspace) 625 switch (cspace)
@@ -639,7 +640,7 @@ eet_data_image_etc2_decode(const void *data,
639 if (lossy != EET_IMAGE_ETC1_ALPHA) goto on_error; 640 if (lossy != EET_IMAGE_ETC1_ALPHA) goto on_error;
640 if (alpha != EINA_TRUE) goto on_error; 641 if (alpha != EINA_TRUE) goto on_error;
641 break; 642 break;
642 case EET_COLORSPACE_ARGB8888: 643 case EMILE_COLORSPACE_ARGB8888:
643 break; 644 break;
644 default: 645 default:
645 goto on_error; 646 goto on_error;
@@ -651,7 +652,7 @@ eet_data_image_etc2_decode(const void *data,
651 goto on_error; 652 goto on_error;
652 653
653 // TODO: Add support for more unpremultiplied modes (ETC2) 654 // TODO: Add support for more unpremultiplied modes (ETC2)
654 if ((cspace == EET_COLORSPACE_ARGB8888) && !prop.premul) 655 if ((cspace == EMILE_COLORSPACE_ARGB8888) && !prop.premul)
655 _eet_argb_premul(p, prop.w * prop.h); 656 _eet_argb_premul(p, prop.w * prop.h);
656 657
657 r = 1; 658 r = 1;