kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2_loaders.git/commit/?id=043b5706aef70a6e2fc8c3bf65ae99c7807ffe72
commit 043b5706aef70a6e2fc8c3bf65ae99c7807ffe72 Author: Kim Woelders <[email protected]> Date: Sun Nov 17 08:58:00 2019 +0100 Match various changes done in imlib2 loaders --- src/modules/loaders/loader_ani.c | 12 ------------ src/modules/loaders/loader_eet.c | 16 ++++------------ src/modules/loaders/loader_xcf.c | 12 ------------ 3 files changed, 4 insertions(+), 36 deletions(-) diff --git a/src/modules/loaders/loader_ani.c b/src/modules/loaders/loader_ani.c index 79fedc5..54496da 100644 --- a/src/modules/loaders/loader_ani.c +++ b/src/modules/loaders/loader_ani.c @@ -256,18 +256,6 @@ load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, MsAni *ani = NULL; MsChunk *chunk; - /* if immediate_load is 1, then dont delay image laoding as below, or */ - /* already data in this image - dont load it again */ - if (im->data) - return 0; - - /* set the format string member to the lower-case full extension */ - /* name for the format - so example names would be: */ - /* "png", "jpeg", "tiff", "ppm", "pgm", "pbm", "gif", "xpm" ... */ - - if (!im->format) - im->format = strdup("ani"); - if (im->loader || immediate_load || progress) { if (!(ani = ani_init((im->real_file)))) diff --git a/src/modules/loaders/loader_eet.c b/src/modules/loaders/loader_eet.c index 0527a1b..95f9d33 100644 --- a/src/modules/loaders/loader_eet.c +++ b/src/modules/loaders/loader_eet.c @@ -73,10 +73,6 @@ load(ImlibImage * im, ImlibProgressFunction progress, DATA32 *ret; DATA32 *body; - if (im->data) - return 0; - if ((!im->file) || (!im->real_file) || (!im->key)) - return 0; strcpy(file, im->real_file); strcpy(key, im->key); if (!can_read(file)) @@ -133,14 +129,10 @@ load(ImlibImage * im, ImlibProgressFunction progress, } im->w = w; im->h = h; - if (!im->format) - { - if (alpha) - SET_FLAG(im->flags, F_HAS_ALPHA); - else - UNSET_FLAG(im->flags, F_HAS_ALPHA); - im->format = strdup("eet"); - } + if (alpha) + SET_FLAG(im->flags, F_HAS_ALPHA); + else + UNSET_FLAG(im->flags, F_HAS_ALPHA); } if (((!im->data) && (im->loader)) || (immediate_load) || (progress)) { diff --git a/src/modules/loaders/loader_xcf.c b/src/modules/loaders/loader_xcf.c index 2da0652..86bdf9c 100644 --- a/src/modules/loaders/loader_xcf.c +++ b/src/modules/loaders/loader_xcf.c @@ -1662,22 +1662,10 @@ char load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, char immediate_load) { - /* if immediate_load is 1, then dont delay image laoding as below, or */ - /* already data in this image - dont load it again */ - - if (im->data) - return 0; - /* initialize */ if (!xcf_file_init(im->real_file)) return 0; - /* set the format string member to the lower-case full extension */ - /* name for the format - so example names would be: */ - /* "png", "jpeg", "tiff", "ppm", "pgm", "pbm", "gif", "xpm" ... */ - if (!im->loader) - im->format = strdup("xcf"); - /* do it! */ xcf_load_image(); --
