jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b06af7ace08590d2366b935150a1f31401c43dda
commit b06af7ace08590d2366b935150a1f31401c43dda Author: Jean-Philippe Andre <[email protected]> Date: Wed Jun 18 16:04:59 2014 +0900 Edje: Add LOSSY_ETC2 to Edje_Edit Found out using edje_inspector... --- src/bin/edje/edje_inspector.c | 4 ++++ src/lib/edje/Edje_Edit.h | 3 ++- src/lib/edje/edje_edit.c | 13 ++++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/bin/edje/edje_inspector.c b/src/bin/edje/edje_inspector.c index 9a4a448..c6f8bd3 100644 --- a/src/bin/edje/edje_inspector.c +++ b/src/bin/edje/edje_inspector.c @@ -1383,6 +1383,10 @@ _comp_str_get(Evas_Object *ed, const char *img) rate = edje_edit_image_compression_rate_get(ed, img); snprintf(buf, sizeof(buf), "LOSSY_ETC1 %d", rate); return buf; + case EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2: + rate = edje_edit_image_compression_rate_get(ed, img); + snprintf(buf, sizeof(buf), "LOSSY_ETC2 %d", rate); + return buf; default: ERR("Unknown compression type %d", type); return "???"; diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h index 2d4c5e7..967f87c 100644 --- a/src/lib/edje/Edje_Edit.h +++ b/src/lib/edje/Edje_Edit.h @@ -39,7 +39,8 @@ typedef enum _Edje_Edit_Image_Comp EDJE_EDIT_IMAGE_COMP_USER, EDJE_EDIT_IMAGE_COMP_COMP, EDJE_EDIT_IMAGE_COMP_LOSSY, - EDJE_EDIT_IMAGE_COMP_LOSSY_ETC1 + EDJE_EDIT_IMAGE_COMP_LOSSY_ETC1, + EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2 } Edje_Edit_Image_Comp; typedef enum _Edje_Edit_Select_Mode diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 34cef5b..1bc5aab 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -6787,6 +6787,8 @@ edje_edit_image_compression_type_get(Evas_Object *obj, const char *image) return EDJE_EDIT_IMAGE_COMP_LOSSY; case EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1: // LOSSY_ETC1 return EDJE_EDIT_IMAGE_COMP_LOSSY_ETC1; + case EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2: // LOSSY_ETC2 + return EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2; case EDJE_IMAGE_SOURCE_TYPE_EXTERNAL: // USER return EDJE_EDIT_IMAGE_COMP_USER; } @@ -6842,6 +6844,11 @@ edje_edit_image_compression_type_set(Evas_Object *obj, const char *image, Edje_E de->source_type = EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1; return EINA_TRUE; } + case EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2: // LOSSY_ETC2 + { + de->source_type = EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2; + return EINA_TRUE; + } case EDJE_EDIT_IMAGE_COMP_USER: // USER { de->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL; @@ -6870,7 +6877,8 @@ edje_edit_image_compression_rate_get(Evas_Object *obj, const char *image) if (i == ed->file->image_dir->entries_count) return -1; if ((de->source_type != EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY) - && (de->source_type != EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1)) + && (de->source_type != EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1) + && (de->source_type != EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2)) return -2; return de->source_param; @@ -8629,6 +8637,9 @@ _edje_generate_image_source(Evas_Object *obj, const char *entry) else if (comp == EDJE_EDIT_IMAGE_COMP_LOSSY_ETC1) BUF_APPENDF("LOSSY_ETC1 %d;\n", edje_edit_image_compression_rate_get(obj, entry)); + else if (comp == EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2) + BUF_APPENDF("LOSSY_ETC2 %d;\n", + edje_edit_image_compression_rate_get(obj, entry)); else if (comp == EDJE_EDIT_IMAGE_COMP_RAW) BUF_APPEND("RAW;\n"); else if (comp == EDJE_EDIT_IMAGE_COMP_USER) --
