kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2.git/commit/?id=54f3e9e54d0cb67a86aab46852fc4d1fb33978c6
commit 54f3e9e54d0cb67a86aab46852fc4d1fb33978c6 Author: Kim Woelders <k...@woelders.dk> Date: Fri Mar 18 07:23:52 2022 +0100 Tweak __imlib_LoadImageData() --- src/lib/image.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/lib/image.c b/src/lib/image.c index dbdf22b..9a54b4e 100644 --- a/src/lib/image.c +++ b/src/lib/image.c @@ -660,10 +660,20 @@ __imlib_LoadImage(const char *file, ImlibLoadArgs * ila) int __imlib_LoadImageData(ImlibImage * im) { - if (!im->data && im->loader) - if (__imlib_LoadImageWrapper(im->loader, im, 1) <= LOAD_FAIL) - return 1; /* Load failed */ - return im->data == NULL; + int err; + + if (im->data) + return 0; /* Ok */ + + /* Just checking - it should be impossible that loader is not set */ + if (!im->loader) + return IMLIB_LOAD_ERROR_UNKNOWN; + + err = __imlib_LoadImageWrapper(im->loader, im, 1); + if (err <= LOAD_FAIL) + return 1; /* Load failed */ + + return 0; /* Ok */ } __EXPORT__ void --