This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository legacy-imlib2.
View the commit online.
commit fb19c620e8c7f950fe5d623f5b671359f5524bba
Author: Kim Woelders <[email protected]>
AuthorDate: Fri Feb 3 09:19:32 2023 +0100
Loaders: decompress_load() is not part of the loader API
---
src/lib/Imlib2_Loader.h | 7 -------
src/modules/loaders/Makefile.am | 6 +++---
src/modules/loaders/compression.h | 11 +++++++++++
src/modules/loaders/decompress_load.c | 1 +
src/modules/loaders/loader_bz2.c | 1 +
src/modules/loaders/loader_lzma.c | 1 +
src/modules/loaders/loader_zlib.c | 1 +
7 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/lib/Imlib2_Loader.h b/src/lib/Imlib2_Loader.h
index ec0c36e..b5b4cbf 100644
--- a/src/lib/Imlib2_Loader.h
+++ b/src/lib/Imlib2_Loader.h
@@ -215,13 +215,6 @@ typedef struct {
.save = _svr, \
}
-typedef int (imlib_decompress_load_f) (const void *fdata,
- unsigned int fsize, int dest);
-
-int decompress_load(ImlibImage * im, int load_data,
- const char *const *pext, int next,
- imlib_decompress_load_f * fdec);
-
#define QUIT_WITH_RC(_err) { rc = _err; goto quit; }
#define PCAST(T, p) ((T)(const void *)(p))
diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am
index eb4b755..cf359e8 100644
--- a/src/modules/loaders/Makefile.am
+++ b/src/modules/loaders/Makefile.am
@@ -169,19 +169,19 @@ xpm_la_LDFLAGS = -module -avoid-version
xpm_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
xpm_la_LIBTOOLFLAGS = --tag=disable-static
-bz2_la_SOURCES = loader_bz2.c decompress_load.c
+bz2_la_SOURCES = loader_bz2.c decompress_load.c compression.h
bz2_la_CPPFLAGS = $(BZ2_CFLAGS) $(AM_CPPFLAGS)
bz2_la_LDFLAGS = -module -avoid-version
bz2_la_LIBADD = $(BZ2_LIBS) $(top_builddir)/src/lib/libImlib2.la
bz2_la_LIBTOOLFLAGS = --tag=disable-static
-lzma_la_SOURCES = loader_lzma.c decompress_load.c
+lzma_la_SOURCES = loader_lzma.c decompress_load.c compression.h
lzma_la_CPPFLAGS = $(LZMA_CFLAGS) $(AM_CPPFLAGS)
lzma_la_LDFLAGS = -module -avoid-version
lzma_la_LIBADD = $(LZMA_LIBS) $(top_builddir)/src/lib/libImlib2.la
lzma_la_LIBTOOLFLAGS = --tag=disable-static
-zlib_la_SOURCES = loader_zlib.c decompress_load.c
+zlib_la_SOURCES = loader_zlib.c decompress_load.c compression.h
zlib_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
zlib_la_LDFLAGS = -module -avoid-version
zlib_la_LIBADD = $(ZLIB_LIBS) $(top_builddir)/src/lib/libImlib2.la
diff --git a/src/modules/loaders/compression.h b/src/modules/loaders/compression.h
new file mode 100644
index 0000000..5f561a4
--- /dev/null
+++ b/src/modules/loaders/compression.h
@@ -0,0 +1,11 @@
+#ifndef COMPRESSION_H
+#define COMPRESSION_H 1
+
+typedef int (imlib_decompress_load_f) (const void *fdata,
+ unsigned int fsize, int dest);
+
+int decompress_load(ImlibImage * im, int load_data,
+ const char *const *pext, int next,
+ imlib_decompress_load_f * fdec);
+
+#endif /* COMPRESSION_H */
diff --git a/src/modules/loaders/decompress_load.c b/src/modules/loaders/decompress_load.c
index 53f7719..76f1d16 100644
--- a/src/modules/loaders/decompress_load.c
+++ b/src/modules/loaders/decompress_load.c
@@ -1,5 +1,6 @@
#include "config.h"
#include "Imlib2_Loader.h"
+#include "compression.h"
int
decompress_load(ImlibImage * im, int load_data, const char *const *pext,
diff --git a/src/modules/loaders/loader_bz2.c b/src/modules/loaders/loader_bz2.c
index d75cf90..a7ba579 100644
--- a/src/modules/loaders/loader_bz2.c
+++ b/src/modules/loaders/loader_bz2.c
@@ -1,5 +1,6 @@
#include "config.h"
#include "Imlib2_Loader.h"
+#include "compression.h"
#include <bzlib.h>
diff --git a/src/modules/loaders/loader_lzma.c b/src/modules/loaders/loader_lzma.c
index 277e5df..ec85539 100644
--- a/src/modules/loaders/loader_lzma.c
+++ b/src/modules/loaders/loader_lzma.c
@@ -1,5 +1,6 @@
#include "config.h"
#include "Imlib2_Loader.h"
+#include "compression.h"
#include <lzma.h>
diff --git a/src/modules/loaders/loader_zlib.c b/src/modules/loaders/loader_zlib.c
index 3f7f520..1061a5a 100644
--- a/src/modules/loaders/loader_zlib.c
+++ b/src/modules/loaders/loader_zlib.c
@@ -1,5 +1,6 @@
#include "config.h"
#include "Imlib2_Loader.h"
+#include "compression.h"
#include <zlib.h>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
