summaryrefslogtreecommitdiff
path: root/src/lib/evas/common
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-10-29 15:30:16 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-10-29 17:58:34 +0900
commitcc5cccc511a3823bf328772e7b7ef9cfa852af54 (patch)
tree7915a73f3f1cbde7d5eef594b440bb7065385aba /src/lib/evas/common
parente586b9debc22ff3257d9405cf0ed0ebf8cf919b8 (diff)
Eet: fix decoding of embedded ETC images
Typos, lack of NULL check, excessive sizeof(type) not matching the object type, no border set, etc... This all lead to a crash and then no render (with an error message and then without...). This also simplifies the implicit loading of ETC1 as ETC2 when supported by the driver. @fix
Diffstat (limited to 'src/lib/evas/common')
-rw-r--r--src/lib/evas/common/evas_image_load.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c
index eacb632..0d02615 100644
--- a/src/lib/evas/common/evas_image_load.c
+++ b/src/lib/evas/common/evas_image_load.c
@@ -215,7 +215,7 @@ _evas_image_file_header(Evas_Module *em, Image_Entry *ie, int *error)
215 goto load_error; 215 goto load_error;
216 } 216 }
217 217
218 memset(&property, 0, sizeof (Evas_Image_Property)); 218 memset(&property, 0, sizeof (property));
219 if (evas_image_load_func->file_head(ie->loader_data, &property, 219 if (evas_image_load_func->file_head(ie->loader_data, &property,
220 error) && 220 error) &&
221 (*error == EVAS_LOAD_ERROR_NONE)) 221 (*error == EVAS_LOAD_ERROR_NONE))
@@ -412,7 +412,7 @@ evas_common_load_rgba_image_data_from_file(Image_Entry *ie)
412 412
413 if (!ie->f) return EVAS_LOAD_ERROR_DOES_NOT_EXIST; 413 if (!ie->f) return EVAS_LOAD_ERROR_DOES_NOT_EXIST;
414 414
415 memset(&property, 0, sizeof (Evas_Image_Property)); 415 memset(&property, 0, sizeof (property));
416 property.w = ie->w; 416 property.w = ie->w;
417 property.h = ie->h; 417 property.h = ie->h;
418 property.scale = ie->scale; 418 property.scale = ie->scale;