diff --git a/src/lib/api.c b/src/lib/api.c index 7050ff4..1b85af3 100644 --- a/src/lib/api.c +++ b/src/lib/api.c @@ -15,6 +15,7 @@ #include "font.h" #include "grad.h" #include "image.h" +#include "loaders.h" #include "rgbadraw.h" #include "rotate.h" #include "scale.h" diff --git a/src/lib/image.h b/src/lib/image.h index 56a0bc0..bf0914f 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -4,7 +4,7 @@ #include "common.h" typedef struct _imlibldctx ImlibLdCtx; -typedef struct _imlibloader ImlibLoader; +typedef struct _ImlibLoader ImlibLoader; typedef struct _ImlibImage ImlibImage; @@ -82,19 +82,6 @@ typedef struct { int frame; } ImlibLoadArgs; -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); - 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.h b/src/lib/loaders.h index 1f31799..2ce3fd5 100644 --- a/src/lib/loaders.h +++ b/src/lib/loaders.h @@ -3,7 +3,7 @@ #include "image.h" -struct _imlibloader { +struct _ImlibLoader { char *file; int num_formats; char **formats; @@ -18,4 +18,17 @@ struct _imlibloader { int (*load2)(ImlibImage * im, int load_data); }; +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/loader_common.h b/src/modules/loaders/loader_common.h index a6c46db..f4d8b09 100644 --- a/src/modules/loaders/loader_common.h +++ b/src/modules/loaders/loader_common.h @@ -11,6 +11,7 @@ #include "common.h" #include "debug.h" #include "image.h" +#include "loaders.h" __EXPORT__ char load(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity, char load_data);