kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2.git/commit/?id=32a1c3ae19aacc72b1616437db86231709416574
commit 32a1c3ae19aacc72b1616437db86231709416574 Author: Kim Woelders <[email protected]> Date: Sat Mar 12 13:25:55 2022 +0100 Merge __imlib_FindBestLoader...() functions And move a few loader related function protoptypes again. --- src/lib/image.c | 4 ++-- src/lib/image.h | 7 +++++++ src/lib/loaders.c | 34 ++++++---------------------------- src/lib/loaders.h | 10 ---------- src/modules/loaders/decompress_load.c | 2 +- src/modules/loaders/loader_common.h | 1 - src/modules/loaders/loader_id3.c | 4 ++-- 7 files changed, 18 insertions(+), 44 deletions(-) diff --git a/src/lib/image.c b/src/lib/image.c index 46e90ae..d5e6f32 100644 --- a/src/lib/image.c +++ b/src/lib/image.c @@ -553,7 +553,7 @@ __imlib_LoadImage(const char *file, ImlibLoadArgs * ila) loader_ret = LOAD_FAIL; /* take a guess by extension on the best loader to use */ - best_loader = __imlib_FindBestLoaderForFile(im->real_file, 0); + best_loader = __imlib_FindBestLoader(im->real_file, NULL, 0); errno = 0; if (best_loader) loader_ret = __imlib_LoadImageWrapper(best_loader, im, ila->immed); @@ -777,7 +777,7 @@ __imlib_SaveImage(ImlibImage * im, const char *file, } /* find the laoder for the format - if its null use the extension */ - l = __imlib_FindBestLoaderForFileFormat(file, im->format, 1); + l = __imlib_FindBestLoader(file, im->format, 1); /* no loader - abort */ if (!l) { diff --git a/src/lib/image.h b/src/lib/image.h index f4f16c1..240355f 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -78,6 +78,13 @@ typedef struct { int frame; } ImlibLoadArgs; +ImlibLoader *__imlib_FindBestLoader(const char *file, const char *format, + int for_save); + +void __imlib_LoaderSetFormats(ImlibLoader * l, + const char *const *fmt, + unsigned int num); + ImlibImage *__imlib_CreateImage(int w, int h, DATA32 * data); ImlibImage *__imlib_LoadImage(const char *file, ImlibLoadArgs * ila); int __imlib_LoadEmbedded(ImlibLoader * l, ImlibImage * im, diff --git a/src/lib/loaders.c b/src/lib/loaders.c index 9d79538..f306d85 100644 --- a/src/lib/loaders.c +++ b/src/lib/loaders.c @@ -8,6 +8,7 @@ #include "debug.h" #include "file.h" +#include "image.h" #include "loaders.h" #define DBG_PFX "LOAD" @@ -316,11 +317,14 @@ __imlib_LookupLoadedLoader(const char *format, int for_save) } __EXPORT__ ImlibLoader * -__imlib_FindBestLoaderForFormat(const char *format, int for_save) +__imlib_FindBestLoader(const char *file, const char *format, int for_save) { ImlibLoader *l; - DP("%s: fmt='%s'\n", __func__, format); + DP("%s: file='%s' fmt='%s'\n", __func__, file, format); + + if (!format) + format = __imlib_FileExtension(file); if (!format || format[0] == '\0') return NULL; @@ -346,32 +350,6 @@ __imlib_FindBestLoaderForFormat(const char *format, int for_save) return l; } -__EXPORT__ ImlibLoader * -__imlib_FindBestLoaderForFile(const char *file, int for_save) -{ - ImlibLoader *l; - - DP("%s: file='%s'\n", __func__, file); - - l = __imlib_FindBestLoaderForFormat(__imlib_FileExtension(file), for_save); - - return l; -} - -ImlibLoader * -__imlib_FindBestLoaderForFileFormat(const char *file, const char *format, - int for_save) -{ - DP("%s: file='%s' ext='%s'\n", __func__, file, format); - - /* if the format is provided ("png" "jpg" etc.) use that */ - /* otherwise us the file extension */ - if (format) - return __imlib_FindBestLoaderForFormat(format, for_save); - else - return __imlib_FindBestLoaderForFile(file, for_save); -} - __EXPORT__ void __imlib_LoaderSetFormats(ImlibLoader * l, const char *const *fmt, unsigned int num) diff --git a/src/lib/loaders.h b/src/lib/loaders.h index f323e23..faacf6c 100644 --- a/src/lib/loaders.h +++ b/src/lib/loaders.h @@ -20,15 +20,5 @@ struct _ImlibLoader { void __imlib_RemoveAllLoaders(void); ImlibLoader **__imlib_GetLoaderList(void); -ImlibLoader *__imlib_FindBestLoaderForFile(const char *file, - int for_save); -ImlibLoader *__imlib_FindBestLoaderForFormat(const char *format, - int for_save); -ImlibLoader *__imlib_FindBestLoaderForFileFormat(const char *file, - const char *format, - int for_save); -void __imlib_LoaderSetFormats(ImlibLoader * l, - const char *const *fmt, - unsigned int num); #endif /* __LOADERS */ diff --git a/src/modules/loaders/decompress_load.c b/src/modules/loaders/decompress_load.c index c4683b1..1337401 100644 --- a/src/modules/loaders/decompress_load.c +++ b/src/modules/loaders/decompress_load.c @@ -41,7 +41,7 @@ decompress_load(ImlibImage * im, int load_data, const char *const *pext, if (!(real_ext = strndup(q, p - q - 1))) return LOAD_OOM; - loader = __imlib_FindBestLoaderForFormat(real_ext, 0); + loader = __imlib_FindBestLoader(NULL, real_ext, 0); free(real_ext); if (!loader) return rc; diff --git a/src/modules/loaders/loader_common.h b/src/modules/loaders/loader_common.h index 17f4b71..5afbac1 100644 --- a/src/modules/loaders/loader_common.h +++ b/src/modules/loaders/loader_common.h @@ -10,7 +10,6 @@ #include "debug.h" #include "image.h" -#include "loaders.h" __EXPORT__ char load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, char load_data); diff --git a/src/modules/loaders/loader_id3.c b/src/modules/loaders/loader_id3.c index a432265..3804be5 100644 --- a/src/modules/loaders/loader_id3.c +++ b/src/modules/loaders/loader_id3.c @@ -376,7 +376,7 @@ get_loader(lopt * opt, ImlibLoader ** loader) return 0; } strncpy(ext + 1, data + 6, EXT_LEN); - if (!(*loader = __imlib_FindBestLoaderForFile(ext, 0))) + if (!(*loader = __imlib_FindBestLoader(ext, NULL, 0))) { fprintf(stderr, "No loader found for extension %s\n", ext); return 0; @@ -552,7 +552,7 @@ load2(ImlibImage * im, int load_data) strncpy(url, data, length); url[length] = '\0'; file = (strncmp(url, "file://", 7) ? url : url + 7); - if (!(loader = __imlib_FindBestLoaderForFile(file, 0))) + if (!(loader = __imlib_FindBestLoader(file, NULL, 0))) { fprintf(stderr, "No loader found for file %s\n", file); free(url); --
