kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Edje: Add LOSSY_ETC2 to Edje_Edit 

Found out using edje_inspector...
This commit is contained in:
Jean-Philippe Andre 2014-06-18 16:04:59 +09:00
parent 10e8b72667
commit b06af7ace0
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/edje/edje_inspector.c
View File

@ -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 "???";

3
src/lib/edje/Edje_Edit.h
View File

@ -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

13
src/lib/edje/edje_edit.c
View File

@ -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)