Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package imlib2 for openSUSE:Factory checked
in at 2023-09-26 22:00:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/imlib2 (Old)
and /work/SRC/openSUSE:Factory/.imlib2.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imlib2"
Tue Sep 26 22:00:48 2023 rev:55 rq:1113374 version:1.12.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/imlib2/imlib2.changes 2023-09-02
22:07:33.535061871 +0200
+++ /work/SRC/openSUSE:Factory/.imlib2.new.1770/imlib2.changes 2023-09-26
22:23:58.984794337 +0200
@@ -1,0 +2,17 @@
+Sat Sep 23 17:14:26 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- update to 1.12.1:
+ * Fix some clang complaints
+ * scaling: MMX asm scaling causes segv, disable for now
+ * loading: Call module exit function also when not
+ dlclosing module on unload
+ * loaders: Fix build with -m32 --enable-debug
+ * test_load_2: Add forgotten xeyes.png
+ * test_save: Fix for jxl loader on ix86
+ * test_scale: MMX scaling is disabled
+ * RAW loader: Don't unload loader
+ * loaders: Fix CPPFLAGS order
+ * imlib2_grab, imlib2_view: Unset context colormap
+ * x11_grab: Use correct depth when grabbing
+
+-------------------------------------------------------------------
Old:
----
imlib2-1.12.0.tar.xz
New:
----
imlib2-1.12.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ imlib2.spec ++++++
--- /var/tmp/diff_new_pack.pVvflB/_old 2023-09-26 22:23:59.988830603 +0200
+++ /var/tmp/diff_new_pack.pVvflB/_new 2023-09-26 22:23:59.992830748 +0200
@@ -25,7 +25,7 @@
%bcond_with svg
%bcond_with postscript
Name: imlib2
-Version: 1.12.0
+Version: 1.12.1
Release: 0
Summary: Image handling and conversion library
License: BSD-3-Clause
++++++ imlib2-1.12.0.tar.xz -> imlib2-1.12.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/ChangeLog new/imlib2-1.12.1/ChangeLog
--- old/imlib2-1.12.0/ChangeLog 2023-08-17 16:14:16.000000000 +0200
+++ new/imlib2-1.12.1/ChangeLog 2023-09-21 16:03:01.000000000 +0200
@@ -1,3 +1,19 @@
+v1.12.1 - 2023-09-21
+--------------------
+Kim Woelders (12):
+ Fix some clang complaints
+ scaling: MMX asm scaling causes segv, disable for now
+ loading: Call module exit function also when not dlclosing module on
unload
+ loaders: Fix build with -m32 --enable-debug
+ test_load_2: Add forgotten xeyes.png
+ test_save: Fix for jxl loader on ix86
+ test_scale: MMX scaling is disabled
+ RAW loader: Don't unload loader
+ loaders: Fix CPPFLAGS order
+ imlib2_grab, imlib2_view: Unset context colormap
+ x11_grab: Use correct depth when grabbing
+ v1.12.1
+
v1.12.0 - 2023-08-17
--------------------
Chema Gonzalez (3):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/Makefile.in
new/imlib2-1.12.1/Makefile.in
--- old/imlib2-1.12.0/Makefile.in 2023-08-17 16:42:48.000000000 +0200
+++ new/imlib2-1.12.1/Makefile.in 2023-09-21 16:48:50.000000000 +0200
@@ -194,7 +194,7 @@
DIST_SUBDIRS = src data doc test
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/README.in \
$(srcdir)/config.h.in $(srcdir)/imlib2.pc.in AUTHORS COPYING \
- ChangeLog INSTALL TODO compile config.guess config.sub depcomp \
+ ChangeLog INSTALL TODO compile config.guess config.sub \
install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/README new/imlib2-1.12.1/README
--- old/imlib2-1.12.0/README 2023-08-17 16:42:54.000000000 +0200
+++ new/imlib2-1.12.1/README 2023-09-21 16:49:02.000000000 +0200
@@ -1,4 +1,4 @@
-Imlib2 1.12.0
+Imlib2 1.12.1
This is the Imlib 2 library - a library that does image file loading and
saving as well as rendering, manipulation, arbitrary polygon support, etc.
@@ -36,7 +36,7 @@
RPM: To build rpm packages:
- sudo rpm -ta imlib2-1.12.0.tar.gz
+ sudo rpm -ta imlib2-1.12.1.tar.gz
You will find rpm packages in your system /usr/src/redhat/* dirs (note you may
not need to use sudo or root if you have your own ~/.rpmrc. see rpm documents
@@ -44,11 +44,11 @@
DEB: To build deb packages:
- tar zvf imlib2-1.12.0.tar.gz
- cd imlib2-1.12.0
+ tar zvf imlib2-1.12.1.tar.gz
+ cd imlib2-1.12.1
dpkg-buildpackage -us -uc -rfakeroot
cd ..
- rm -rf imlib2-1.12.0
+ rm -rf imlib2-1.12.1
You will find all the debian source, binary etc. packages put in the directory
where you first untarred the source tarball.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/configure new/imlib2-1.12.1/configure
--- old/imlib2-1.12.0/configure 2023-08-17 16:42:48.000000000 +0200
+++ new/imlib2-1.12.1/configure 2023-09-21 16:48:49.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for imlib2 1.12.0.
+# Generated by GNU Autoconf 2.71 for imlib2 1.12.1.
#
# Report bugs to <enlightenment-de...@lists.sourceforge.net>.
#
@@ -621,8 +621,8 @@
# Identity of this package.
PACKAGE_NAME='imlib2'
PACKAGE_TARNAME='imlib2'
-PACKAGE_VERSION='1.12.0'
-PACKAGE_STRING='imlib2 1.12.0'
+PACKAGE_VERSION='1.12.1'
+PACKAGE_STRING='imlib2 1.12.1'
PACKAGE_BUGREPORT='enlightenment-de...@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1538,7 +1538,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures imlib2 1.12.0 to adapt to many kinds of systems.
+\`configure' configures imlib2 1.12.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1613,7 +1613,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of imlib2 1.12.0:";;
+ short | recursive ) echo "Configuration of imlib2 1.12.1:";;
esac
cat <<\_ACEOF
@@ -1807,7 +1807,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-imlib2 configure 1.12.0
+imlib2 configure 1.12.1
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2290,7 +2290,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by imlib2 $as_me 1.12.0, which was
+It was created by imlib2 $as_me 1.12.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3855,7 +3855,7 @@
# Define the identity of the package.
PACKAGE='imlib2'
- VERSION='1.12.0'
+ VERSION='1.12.1'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -18692,7 +18692,7 @@
VERSION_CUR=13
-VERSION_REV=0
+VERSION_REV=1
VERSION_AGE=12
lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE}
@@ -23020,7 +23020,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by imlib2 $as_me 1.12.0, which was
+This file was extended by imlib2 $as_me 1.12.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23088,7 +23088,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-imlib2 config.status 1.12.0
+imlib2 config.status 1.12.1
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/configure.ac
new/imlib2-1.12.1/configure.ac
--- old/imlib2-1.12.0/configure.ac 2023-08-17 16:14:09.000000000 +0200
+++ new/imlib2-1.12.1/configure.ac 2023-09-21 16:01:41.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([imlib2],[1.12.0],[enlightenment-de...@lists.sourceforge.net])
+AC_INIT([imlib2],[1.12.1],[enlightenment-de...@lists.sourceforge.net])
AC_CONFIG_SRCDIR(configure.ac)
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_BUILD
@@ -21,7 +21,7 @@
LT_INIT
VERSION_CUR=13
-VERSION_REV=0
+VERSION_REV=1
VERSION_AGE=12
lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE}
AC_SUBST(lt_version)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/data/Makefile.in
new/imlib2-1.12.1/data/Makefile.in
--- old/imlib2-1.12.0/data/Makefile.in 2023-08-17 16:42:48.000000000 +0200
+++ new/imlib2-1.12.1/data/Makefile.in 2023-09-21 16:48:50.000000000 +0200
@@ -411,9 +411,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/Makefile
+ $(AUTOMAKE) --gnu data/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/data/fonts/Makefile.in
new/imlib2-1.12.1/data/fonts/Makefile.in
--- old/imlib2-1.12.0/data/fonts/Makefile.in 2023-08-17 16:42:48.000000000
+0200
+++ new/imlib2-1.12.1/data/fonts/Makefile.in 2023-09-21 16:48:50.000000000
+0200
@@ -357,9 +357,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/fonts/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/fonts/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/fonts/Makefile
+ $(AUTOMAKE) --gnu data/fonts/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/data/images/Makefile.in
new/imlib2-1.12.1/data/images/Makefile.in
--- old/imlib2-1.12.0/data/images/Makefile.in 2023-08-17 16:42:49.000000000
+0200
+++ new/imlib2-1.12.1/data/images/Makefile.in 2023-09-21 16:48:50.000000000
+0200
@@ -371,9 +371,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/images/Makefile';
\
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/images/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/images/Makefile
+ $(AUTOMAKE) --gnu data/images/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/doc/Makefile.in
new/imlib2-1.12.1/doc/Makefile.in
--- old/imlib2-1.12.0/doc/Makefile.in 2023-08-17 16:42:49.000000000 +0200
+++ new/imlib2-1.12.1/doc/Makefile.in 2023-09-21 16:48:50.000000000 +0200
@@ -321,9 +321,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign doc/Makefile
+ $(AUTOMAKE) --gnu doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/Makefile.in
new/imlib2-1.12.1/src/Makefile.in
--- old/imlib2-1.12.0/src/Makefile.in 2023-08-17 16:42:49.000000000 +0200
+++ new/imlib2-1.12.1/src/Makefile.in 2023-09-21 16:48:50.000000000 +0200
@@ -377,9 +377,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/Makefile
+ $(AUTOMAKE) --gnu src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/bin/Makefile.in
new/imlib2-1.12.1/src/bin/Makefile.in
--- old/imlib2-1.12.0/src/bin/Makefile.in 2023-08-17 16:42:49.000000000
+0200
+++ new/imlib2-1.12.1/src/bin/Makefile.in 2023-09-21 16:48:50.000000000
+0200
@@ -449,9 +449,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/bin/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/bin/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/bin/Makefile
+ $(AUTOMAKE) --gnu src/bin/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/bin/imlib2_grab.c
new/imlib2-1.12.1/src/bin/imlib2_grab.c
--- old/imlib2-1.12.0/src/bin/imlib2_grab.c 2023-05-08 12:24:57.000000000
+0200
+++ new/imlib2-1.12.1/src/bin/imlib2_grab.c 2023-09-21 09:25:16.000000000
+0200
@@ -92,6 +92,7 @@
file = argv[0];
prog_x11_init();
+ imlib_context_set_colormap(None);
if (draw == None)
draw = DefaultRootWindow(disp);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/bin/imlib2_load.c
new/imlib2-1.12.1/src/bin/imlib2_load.c
--- old/imlib2-1.12.0/src/bin/imlib2_load.c 2023-08-16 12:14:20.000000000
+0200
+++ new/imlib2-1.12.1/src/bin/imlib2_load.c 2023-09-21 09:41:54.000000000
+0200
@@ -91,14 +91,14 @@
else
ext = file;
- err = stat(file, &st);
- if (err)
- goto bail;
-
im = NULL;
fd = -1;
fdata = MAP_FAILED;
+ err = stat(file, &st);
+ if (err)
+ goto bail;
+
fd = open(file, O_RDONLY);
if (fd < 0)
goto bail;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/bin/imlib2_view.c
new/imlib2-1.12.1/src/bin/imlib2_view.c
--- old/imlib2-1.12.0/src/bin/imlib2_view.c 2023-08-16 12:14:12.000000000
+0200
+++ new/imlib2-1.12.1/src/bin/imlib2_view.c 2023-09-21 09:39:48.000000000
+0200
@@ -658,6 +658,7 @@
}
prog_x11_init();
+ imlib_context_set_colormap(None);
win = prog_x11_create_window("imlib2_view", 10, 10);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/lib/Imlib2.h
new/imlib2-1.12.1/src/lib/Imlib2.h
--- old/imlib2-1.12.0/src/lib/Imlib2.h 2023-08-17 16:42:53.000000000 +0200
+++ new/imlib2-1.12.1/src/lib/Imlib2.h 2023-09-21 16:49:01.000000000 +0200
@@ -5,7 +5,7 @@
*/
#define IMLIB2_VERSION_MAJOR 1
#define IMLIB2_VERSION_MINOR 12
-#define IMLIB2_VERSION_MICRO 0
+#define IMLIB2_VERSION_MICRO 1
#define IMLIB2_VERSION_(maj, min, mic) (10000 * (maj) + 100 * (min) + (mic))
#define IMLIB2_VERSION IMLIB2_VERSION_(IMLIB2_VERSION_MAJOR,
IMLIB2_VERSION_MINOR, IMLIB2_VERSION_MICRO)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/lib/api_x11.c
new/imlib2-1.12.1/src/lib/api_x11.c
--- old/imlib2-1.12.0/src/lib/api_x11.c 2023-08-16 12:18:21.000000000 +0200
+++ new/imlib2-1.12.1/src/lib/api_x11.c 2023-09-21 09:39:47.000000000 +0200
@@ -329,7 +329,8 @@
if (!im)
return NULL;
- __imlib_GrabXImageToRGBA(&ctx->x11, im->data, 0, 0, width, height,
+ __imlib_GrabXImageToRGBA(&ctx->x11, image->depth, im->data,
+ 0, 0, width, height,
image, mask, x, y, width, height, need_to_grab_x);
return im;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/lib/draw_polygon.c
new/imlib2-1.12.1/src/lib/draw_polygon.c
--- old/imlib2-1.12.0/src/lib/draw_polygon.c 2023-08-16 12:18:21.000000000
+0200
+++ new/imlib2-1.12.1/src/lib/draw_polygon.c 2023-08-24 19:24:19.000000000
+0200
@@ -9,7 +9,7 @@
#include "span.h"
ImlibPoly *
-__imlib_polygon_new()
+__imlib_polygon_new(void)
{
ImlibPoly *poly;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/lib/dynamic_filters.c
new/imlib2-1.12.1/src/lib/dynamic_filters.c
--- old/imlib2-1.12.0/src/lib/dynamic_filters.c 2023-08-16 12:16:35.000000000
+0200
+++ new/imlib2-1.12.1/src/lib/dynamic_filters.c 2023-08-24 19:24:19.000000000
+0200
@@ -75,7 +75,7 @@
}
void
-__imlib_dynamic_filters_init()
+__imlib_dynamic_filters_init(void)
{
char **list;
int num_filters, i = 0;
@@ -116,7 +116,7 @@
}
void
-__imlib_dynamic_filters_deinit()
+__imlib_dynamic_filters_deinit(void)
{
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/lib/loaders.c
new/imlib2-1.12.1/src/lib/loaders.c
--- old/imlib2-1.12.0/src/lib/loaders.c 2023-08-16 12:18:21.000000000 +0200
+++ new/imlib2-1.12.1/src/lib/loaders.c 2023-09-21 09:41:54.000000000 +0200
@@ -237,6 +237,9 @@
static void
__imlib_ConsumeLoader(ImlibLoader * l)
{
+ if (l->module->inex)
+ l->module->inex(0);
+
if (l->module->ldr_flags & LDR_FLAG_KEEP)
{
/* Not un/re-loadable - Move to unloaded loaders list */
@@ -245,9 +248,6 @@
return;
}
- if (l->module->inex)
- l->module->inex(0);
-
if (l->handle)
dlclose(l->handle);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/lib/scale.c
new/imlib2-1.12.1/src/lib/scale.c
--- old/imlib2-1.12.0/src/lib/scale.c 2023-08-16 12:18:21.000000000 +0200
+++ new/imlib2-1.12.1/src/lib/scale.c 2023-09-21 09:39:48.000000000 +0200
@@ -8,6 +8,8 @@
#include "image.h"
#include "scale.h"
+#undef DO_MMX_ASM // __imlib_Scale_mmx_AARGBA() is broken
+
/*\ NB: If you change this, don't forget asm_scale.S \*/
struct _imlib_scale_info {
int *xpoints;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/lib/x11_grab.c
new/imlib2-1.12.1/src/lib/x11_grab.c
--- old/imlib2-1.12.0/src/lib/x11_grab.c 2023-08-16 12:18:21.000000000
+0200
+++ new/imlib2-1.12.1/src/lib/x11_grab.c 2023-09-21 09:39:48.000000000
+0200
@@ -24,13 +24,13 @@
#define PTR(T, im_, y_) (T*)(void*)(im_->data + (im_->bytes_per_line * y_))
void
-__imlib_GrabXImageToRGBA(const ImlibContextX11 * x11, uint32_t * data,
+__imlib_GrabXImageToRGBA(const ImlibContextX11 * x11, int depth,
+ uint32_t * data,
int x_dst, int y_dst, int w_dst, int h_dst,
XImage * xim, XImage * mxim,
int x_src, int y_src, int w_src, int h_src, int grab)
{
int x, y, inx, iny;
- int depth;
const uint32_t *src;
const uint16_t *s16;
uint32_t *ptr;
@@ -58,7 +58,6 @@
/* go thru the XImage and convert */
- depth = x11->depth;
if ((depth == 24) && (xim->bits_per_pixel == 32))
depth = 25; /* fake depth meaning 24 bit in 32 bpp ximage
*/
@@ -814,7 +813,7 @@
CLEAR(x_dst + w_src, w_dst, y_dst, y_dst + h_src);
}
- __imlib_GrabXImageToRGBA(x11, data, x_dst, y_dst, w_dst, h_dst,
+ __imlib_GrabXImageToRGBA(x11, xatt.depth, data, x_dst, y_dst, w_dst, h_dst,
xim, mxim, x_src, y_src, w_src, h_src, 0);
/* destroy the Ximage */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/lib/x11_grab.h
new/imlib2-1.12.1/src/lib/x11_grab.h
--- old/imlib2-1.12.0/src/lib/x11_grab.h 2023-08-16 12:16:35.000000000
+0200
+++ new/imlib2-1.12.1/src/lib/x11_grab.h 2023-09-21 09:25:16.000000000
+0200
@@ -26,7 +26,7 @@
bool clear);
void __imlib_GrabXImageToRGBA(const ImlibContextX11 * x11,
- uint32_t * data,
+ int depth, uint32_t * data,
int x_dst, int y_dst,
int w_dst, int h_dst,
XImage * xim, XImage * mxim,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/Makefile.in
new/imlib2-1.12.1/src/modules/Makefile.in
--- old/imlib2-1.12.0/src/modules/Makefile.in 2023-08-17 16:42:49.000000000
+0200
+++ new/imlib2-1.12.1/src/modules/Makefile.in 2023-09-21 16:48:50.000000000
+0200
@@ -378,9 +378,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/modules/Makefile';
\
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/modules/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/modules/Makefile
+ $(AUTOMAKE) --gnu src/modules/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/filters/Makefile.in
new/imlib2-1.12.1/src/modules/filters/Makefile.in
--- old/imlib2-1.12.0/src/modules/filters/Makefile.in 2023-08-17
16:42:49.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/filters/Makefile.in 2023-09-21
16:48:50.000000000 +0200
@@ -433,9 +433,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
src/modules/filters/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu
src/modules/filters/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/modules/filters/Makefile
+ $(AUTOMAKE) --gnu src/modules/filters/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/filters/filter_bumpmap.c
new/imlib2-1.12.1/src/modules/filters/filter_bumpmap.c
--- old/imlib2-1.12.0/src/modules/filters/filter_bumpmap.c 2023-05-08
12:24:57.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/filters/filter_bumpmap.c 2023-08-24
19:24:19.000000000 +0200
@@ -264,7 +264,7 @@
}
void
-deinit()
+deinit(void)
{
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/filters/filter_colormod.c
new/imlib2-1.12.1/src/modules/filters/filter_colormod.c
--- old/imlib2-1.12.0/src/modules/filters/filter_colormod.c 2023-05-08
12:24:57.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/filters/filter_colormod.c 2023-08-24
19:24:19.000000000 +0200
@@ -245,7 +245,7 @@
}
void
-deinit()
+deinit(void)
{
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/loaders/Makefile.am
new/imlib2-1.12.1/src/modules/loaders/Makefile.am
--- old/imlib2-1.12.0/src/modules/loaders/Makefile.am 2023-07-02
21:33:39.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/loaders/Makefile.am 2023-09-04
17:01:33.000000000 +0200
@@ -94,7 +94,7 @@
gif_la_LIBTOOLFLAGS = --tag=disable-static
heif_la_SOURCES = loader_heif.c
-heif_la_CPPFLAGS = $(HEIF_CFLAGS) $(AM_CPPFLAGS)
+heif_la_CPPFLAGS = $(AM_CPPFLAGS) $(HEIF_CFLAGS)
heif_la_LDFLAGS = -module -avoid-version
heif_la_LIBADD = $(HEIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
heif_la_LIBTOOLFLAGS = --tag=disable-static
@@ -105,19 +105,19 @@
ico_la_LIBTOOLFLAGS = --tag=disable-static
jpeg_la_SOURCES = loader_jpeg.c exif.c exif.h
-jpeg_la_CPPFLAGS = $(JPEG_CFLAGS) $(AM_CPPFLAGS)
+jpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
jpeg_la_LDFLAGS = -module -avoid-version
jpeg_la_LIBADD = $(JPEG_LIBS) $(top_builddir)/src/lib/libImlib2.la
jpeg_la_LIBTOOLFLAGS = --tag=disable-static
j2k_la_SOURCES = loader_j2k.c
-j2k_la_CPPFLAGS = $(J2K_CFLAGS) $(AM_CPPFLAGS)
+j2k_la_CPPFLAGS = $(AM_CPPFLAGS) $(J2K_CFLAGS)
j2k_la_LDFLAGS = -module -avoid-version
j2k_la_LIBADD = $(J2K_LIBS) $(top_builddir)/src/lib/libImlib2.la
j2k_la_LIBTOOLFLAGS = --tag=disable-static
jxl_la_SOURCES = loader_jxl.c
-jxl_la_CPPFLAGS = $(JXL_CFLAGS) $(AM_CPPFLAGS)
+jxl_la_CPPFLAGS = $(AM_CPPFLAGS) $(JXL_CFLAGS)
jxl_la_LDFLAGS = -module -avoid-version
jxl_la_LIBADD = $(JXL_LIBS) $(top_builddir)/src/lib/libImlib2.la
jxl_la_LIBTOOLFLAGS = --tag=disable-static
@@ -128,7 +128,7 @@
lbm_la_LIBTOOLFLAGS = --tag=disable-static
png_la_SOURCES = loader_png.c
-png_la_CPPFLAGS = $(PNG_CFLAGS) $(AM_CPPFLAGS)
+png_la_CPPFLAGS = $(AM_CPPFLAGS) $(PNG_CFLAGS)
png_la_LDFLAGS = -module -avoid-version
png_la_LIBADD = $(PNG_LIBS) $(top_builddir)/src/lib/libImlib2.la
png_la_LIBTOOLFLAGS = --tag=disable-static
@@ -139,13 +139,13 @@
pnm_la_LIBTOOLFLAGS = --tag=disable-static
ps_la_SOURCES = loader_ps.c
-ps_la_CPPFLAGS = $(PS_CFLAGS) $(AM_CPPFLAGS)
+ps_la_CPPFLAGS = $(AM_CPPFLAGS) $(PS_CFLAGS)
ps_la_LDFLAGS = -module -avoid-version
ps_la_LIBADD = $(PS_LIBS) $(top_builddir)/src/lib/libImlib2.la
ps_la_LIBTOOLFLAGS = --tag=disable-static
raw_la_SOURCES = loader_raw.c
-raw_la_CPPFLAGS = $(RAW_CFLAGS) $(AM_CPPFLAGS)
+raw_la_CPPFLAGS = $(AM_CPPFLAGS) $(RAW_CFLAGS)
raw_la_LDFLAGS = -module -avoid-version
raw_la_LIBADD = $(RAW_LIBS) $(top_builddir)/src/lib/libImlib2.la
raw_la_LIBTOOLFLAGS = --tag=disable-static
@@ -156,7 +156,7 @@
qoi_la_LIBTOOLFLAGS = --tag=disable-static
svg_la_SOURCES = loader_svg.c
-svg_la_CPPFLAGS = $(SVG_CFLAGS) $(AM_CPPFLAGS)
+svg_la_CPPFLAGS = $(AM_CPPFLAGS) $(SVG_CFLAGS)
svg_la_LDFLAGS = -module -avoid-version
svg_la_LIBADD = $(SVG_LIBS) $(top_builddir)/src/lib/libImlib2.la
svg_la_LIBTOOLFLAGS = --tag=disable-static
@@ -167,13 +167,13 @@
tga_la_LIBTOOLFLAGS = --tag=disable-static
tiff_la_SOURCES = loader_tiff.c
-tiff_la_CPPFLAGS = $(TIFF_CFLAGS) $(AM_CPPFLAGS)
+tiff_la_CPPFLAGS = $(AM_CPPFLAGS) $(TIFF_CFLAGS)
tiff_la_LDFLAGS = -module -avoid-version
tiff_la_LIBADD = $(TIFF_LIBS) $(top_builddir)/src/lib/libImlib2.la
tiff_la_LIBTOOLFLAGS = --tag=disable-static
webp_la_SOURCES = loader_webp.c
-webp_la_CPPFLAGS = $(WEBP_CFLAGS) $(AM_CPPFLAGS)
+webp_la_CPPFLAGS = $(AM_CPPFLAGS) $(WEBP_CFLAGS)
webp_la_LDFLAGS = -module -avoid-version
webp_la_LIBADD = $(WEBP_LIBS) $(top_builddir)/src/lib/libImlib2.la
webp_la_LIBTOOLFLAGS = --tag=disable-static
@@ -189,31 +189,31 @@
xpm_la_LIBTOOLFLAGS = --tag=disable-static
y4m_la_SOURCES = loader_y4m.c
-y4m_la_CPPFLAGS = $(Y4M_CFLAGS) $(AM_CPPFLAGS)
+y4m_la_CPPFLAGS = $(AM_CPPFLAGS) $(Y4M_CFLAGS)
y4m_la_LDFLAGS = -module -avoid-version
y4m_la_LIBADD = $(Y4M_LIBS) $(top_builddir)/src/lib/libImlib2.la
y4m_la_LIBTOOLFLAGS = --tag=disable-static
bz2_la_SOURCES = loader_bz2.c decompress_load.c compression.h
-bz2_la_CPPFLAGS = $(BZ2_CFLAGS) $(AM_CPPFLAGS)
+bz2_la_CPPFLAGS = $(AM_CPPFLAGS) $(BZ2_CFLAGS)
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 compression.h
-lzma_la_CPPFLAGS = $(LZMA_CFLAGS) $(AM_CPPFLAGS)
+lzma_la_CPPFLAGS = $(AM_CPPFLAGS) $(LZMA_CFLAGS)
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 compression.h
-zlib_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
+zlib_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS)
zlib_la_LDFLAGS = -module -avoid-version
zlib_la_LIBADD = $(ZLIB_LIBS) $(top_builddir)/src/lib/libImlib2.la
zlib_la_LIBTOOLFLAGS = --tag=disable-static
id3_la_SOURCES = loader_id3.c
-id3_la_CPPFLAGS = $(ID3_CFLAGS) $(AM_CPPFLAGS)
+id3_la_CPPFLAGS = $(AM_CPPFLAGS) $(ID3_CFLAGS)
id3_la_LDFLAGS = -module -avoid-version
id3_la_LIBADD = $(ID3_LIBS) $(top_builddir)/src/lib/libImlib2.la
id3_la_LIBTOOLFLAGS = --tag=disable-static
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/loaders/Makefile.in
new/imlib2-1.12.1/src/modules/loaders/Makefile.in
--- old/imlib2-1.12.0/src/modules/loaders/Makefile.in 2023-08-17
16:42:49.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/loaders/Makefile.in 2023-09-21
16:48:50.000000000 +0200
@@ -668,7 +668,7 @@
gif_la_LIBADD = $(GIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
gif_la_LIBTOOLFLAGS = --tag=disable-static
heif_la_SOURCES = loader_heif.c
-heif_la_CPPFLAGS = $(HEIF_CFLAGS) $(AM_CPPFLAGS)
+heif_la_CPPFLAGS = $(AM_CPPFLAGS) $(HEIF_CFLAGS)
heif_la_LDFLAGS = -module -avoid-version
heif_la_LIBADD = $(HEIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
heif_la_LIBTOOLFLAGS = --tag=disable-static
@@ -677,17 +677,17 @@
ico_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
ico_la_LIBTOOLFLAGS = --tag=disable-static
jpeg_la_SOURCES = loader_jpeg.c exif.c exif.h
-jpeg_la_CPPFLAGS = $(JPEG_CFLAGS) $(AM_CPPFLAGS)
+jpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
jpeg_la_LDFLAGS = -module -avoid-version
jpeg_la_LIBADD = $(JPEG_LIBS) $(top_builddir)/src/lib/libImlib2.la
jpeg_la_LIBTOOLFLAGS = --tag=disable-static
j2k_la_SOURCES = loader_j2k.c
-j2k_la_CPPFLAGS = $(J2K_CFLAGS) $(AM_CPPFLAGS)
+j2k_la_CPPFLAGS = $(AM_CPPFLAGS) $(J2K_CFLAGS)
j2k_la_LDFLAGS = -module -avoid-version
j2k_la_LIBADD = $(J2K_LIBS) $(top_builddir)/src/lib/libImlib2.la
j2k_la_LIBTOOLFLAGS = --tag=disable-static
jxl_la_SOURCES = loader_jxl.c
-jxl_la_CPPFLAGS = $(JXL_CFLAGS) $(AM_CPPFLAGS)
+jxl_la_CPPFLAGS = $(AM_CPPFLAGS) $(JXL_CFLAGS)
jxl_la_LDFLAGS = -module -avoid-version
jxl_la_LIBADD = $(JXL_LIBS) $(top_builddir)/src/lib/libImlib2.la
jxl_la_LIBTOOLFLAGS = --tag=disable-static
@@ -696,7 +696,7 @@
lbm_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
lbm_la_LIBTOOLFLAGS = --tag=disable-static
png_la_SOURCES = loader_png.c
-png_la_CPPFLAGS = $(PNG_CFLAGS) $(AM_CPPFLAGS)
+png_la_CPPFLAGS = $(AM_CPPFLAGS) $(PNG_CFLAGS)
png_la_LDFLAGS = -module -avoid-version
png_la_LIBADD = $(PNG_LIBS) $(top_builddir)/src/lib/libImlib2.la
png_la_LIBTOOLFLAGS = --tag=disable-static
@@ -705,12 +705,12 @@
pnm_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
pnm_la_LIBTOOLFLAGS = --tag=disable-static
ps_la_SOURCES = loader_ps.c
-ps_la_CPPFLAGS = $(PS_CFLAGS) $(AM_CPPFLAGS)
+ps_la_CPPFLAGS = $(AM_CPPFLAGS) $(PS_CFLAGS)
ps_la_LDFLAGS = -module -avoid-version
ps_la_LIBADD = $(PS_LIBS) $(top_builddir)/src/lib/libImlib2.la
ps_la_LIBTOOLFLAGS = --tag=disable-static
raw_la_SOURCES = loader_raw.c
-raw_la_CPPFLAGS = $(RAW_CFLAGS) $(AM_CPPFLAGS)
+raw_la_CPPFLAGS = $(AM_CPPFLAGS) $(RAW_CFLAGS)
raw_la_LDFLAGS = -module -avoid-version
raw_la_LIBADD = $(RAW_LIBS) $(top_builddir)/src/lib/libImlib2.la
raw_la_LIBTOOLFLAGS = --tag=disable-static
@@ -719,7 +719,7 @@
qoi_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
qoi_la_LIBTOOLFLAGS = --tag=disable-static
svg_la_SOURCES = loader_svg.c
-svg_la_CPPFLAGS = $(SVG_CFLAGS) $(AM_CPPFLAGS)
+svg_la_CPPFLAGS = $(AM_CPPFLAGS) $(SVG_CFLAGS)
svg_la_LDFLAGS = -module -avoid-version
svg_la_LIBADD = $(SVG_LIBS) $(top_builddir)/src/lib/libImlib2.la
svg_la_LIBTOOLFLAGS = --tag=disable-static
@@ -728,12 +728,12 @@
tga_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
tga_la_LIBTOOLFLAGS = --tag=disable-static
tiff_la_SOURCES = loader_tiff.c
-tiff_la_CPPFLAGS = $(TIFF_CFLAGS) $(AM_CPPFLAGS)
+tiff_la_CPPFLAGS = $(AM_CPPFLAGS) $(TIFF_CFLAGS)
tiff_la_LDFLAGS = -module -avoid-version
tiff_la_LIBADD = $(TIFF_LIBS) $(top_builddir)/src/lib/libImlib2.la
tiff_la_LIBTOOLFLAGS = --tag=disable-static
webp_la_SOURCES = loader_webp.c
-webp_la_CPPFLAGS = $(WEBP_CFLAGS) $(AM_CPPFLAGS)
+webp_la_CPPFLAGS = $(AM_CPPFLAGS) $(WEBP_CFLAGS)
webp_la_LDFLAGS = -module -avoid-version
webp_la_LIBADD = $(WEBP_LIBS) $(top_builddir)/src/lib/libImlib2.la
webp_la_LIBTOOLFLAGS = --tag=disable-static
@@ -746,27 +746,27 @@
xpm_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
xpm_la_LIBTOOLFLAGS = --tag=disable-static
y4m_la_SOURCES = loader_y4m.c
-y4m_la_CPPFLAGS = $(Y4M_CFLAGS) $(AM_CPPFLAGS)
+y4m_la_CPPFLAGS = $(AM_CPPFLAGS) $(Y4M_CFLAGS)
y4m_la_LDFLAGS = -module -avoid-version
y4m_la_LIBADD = $(Y4M_LIBS) $(top_builddir)/src/lib/libImlib2.la
y4m_la_LIBTOOLFLAGS = --tag=disable-static
bz2_la_SOURCES = loader_bz2.c decompress_load.c compression.h
-bz2_la_CPPFLAGS = $(BZ2_CFLAGS) $(AM_CPPFLAGS)
+bz2_la_CPPFLAGS = $(AM_CPPFLAGS) $(BZ2_CFLAGS)
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 compression.h
-lzma_la_CPPFLAGS = $(LZMA_CFLAGS) $(AM_CPPFLAGS)
+lzma_la_CPPFLAGS = $(AM_CPPFLAGS) $(LZMA_CFLAGS)
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 compression.h
-zlib_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
+zlib_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS)
zlib_la_LDFLAGS = -module -avoid-version
zlib_la_LIBADD = $(ZLIB_LIBS) $(top_builddir)/src/lib/libImlib2.la
zlib_la_LIBTOOLFLAGS = --tag=disable-static
id3_la_SOURCES = loader_id3.c
-id3_la_CPPFLAGS = $(ID3_CFLAGS) $(AM_CPPFLAGS)
+id3_la_CPPFLAGS = $(AM_CPPFLAGS) $(ID3_CFLAGS)
id3_la_LDFLAGS = -module -avoid-version
id3_la_LIBADD = $(ID3_LIBS) $(top_builddir)/src/lib/libImlib2.la
id3_la_LIBTOOLFLAGS = --tag=disable-static
@@ -783,9 +783,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
src/modules/loaders/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu
src/modules/loaders/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/modules/loaders/Makefile
+ $(AUTOMAKE) --gnu src/modules/loaders/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/loaders/loader_ani.c
new/imlib2-1.12.1/src/modules/loaders/loader_ani.c
--- old/imlib2-1.12.0/src/modules/loaders/loader_ani.c 2023-05-08
12:24:57.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/loaders/loader_ani.c 2023-09-03
17:11:21.000000000 +0200
@@ -88,7 +88,7 @@
return rc;
}
-#define OFFS(p) ((const char*)(p) - (const char*)im->fi->fdata)
+#define OFFS(p) (long)((const char*)(p) - (const char*)im->fi->fdata)
static int
_riff_parse(ImlibImage * im, riff_ctx_t * ctx, const char *fdata,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/loaders/loader_j2k.c
new/imlib2-1.12.1/src/modules/loaders/loader_j2k.c
--- old/imlib2-1.12.0/src/modules/loaders/loader_j2k.c 2023-05-08
12:24:57.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/loaders/loader_j2k.c 2023-09-03
17:11:21.000000000 +0200
@@ -53,7 +53,7 @@
static OPJ_SIZE_T
mm_read(void *dst, OPJ_SIZE_T len, void *data)
{
- DL("%s: len=%ld\n", __func__, len);
+ DL("%s: len=%ld\n", __func__, (long)len);
if (mdata.dptr >= mdata.data + mdata.size)
return -1; /* Out of data */
@@ -69,7 +69,7 @@
static OPJ_OFF_T
mm_seek_cur(OPJ_OFF_T offs, void *data)
{
- DL("%s: offs=%ld\n", __func__, offs);
+ DL("%s: offs=%ld\n", __func__, (long)offs);
if (mdata.dptr + offs > mdata.data + mdata.size)
return 0; /* Out of data */
@@ -82,7 +82,7 @@
static OPJ_BOOL
mm_seek_set(OPJ_OFF_T offs, void *data)
{
- DL("%s: offs=%ld\n", __func__, offs);
+ DL("%s: offs=%ld\n", __func__, (long)offs);
if (offs > mdata.size)
return OPJ_FALSE; /* Out of data */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/loaders/loader_jpeg.c
new/imlib2-1.12.1/src/modules/loaders/loader_jpeg.c
--- old/imlib2-1.12.0/src/modules/loaders/loader_jpeg.c 2023-08-16
12:14:20.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/loaders/loader_jpeg.c 2023-09-21
09:41:54.000000000 +0200
@@ -191,7 +191,8 @@
break;
}
DL("l,s,y=%d,%d, %d - x,y=%4ld,%4ld\n", l, y, l + y,
- (imdata - im->data) % im->w, (imdata - im->data) / im->w);
+ (long)((imdata - im->data) % im->w),
+ (long)((imdata - im->data) / im->w));
switch (jds.out_color_space)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/loaders/loader_jxl.c
new/imlib2-1.12.1/src/modules/loaders/loader_jxl.c
--- old/imlib2-1.12.0/src/modules/loaders/loader_jxl.c 2023-08-16
12:14:12.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/loaders/loader_jxl.c 2023-09-21
09:39:48.000000000 +0200
@@ -22,7 +22,8 @@
uint32_t *imdata;
size_t i;
- DL("%s: x,y=%ld,%ld len=%lu\n", __func__, x, y, num_pixels);
+ DL("%s: x,y=%ld,%ld len=%lu\n", __func__,
+ (long)x, (long)y, (long)num_pixels);
imdata = im->data + (im->w * y) + x;
@@ -52,7 +53,7 @@
ImlibImageFrame *pf;
#if MAX_RUNNERS > 0
- size_t n_runners;
+ unsigned int n_runners;
JxlParallelRunner *runner = NULL;
#endif
@@ -80,7 +81,7 @@
n_runners = JxlThreadParallelRunnerDefaultNumWorkerThreads();
if (n_runners > MAX_RUNNERS)
n_runners = MAX_RUNNERS;
- D("n_runners = %ld\n", n_runners);
+ D("n_runners = %d\n", n_runners);
runner = JxlThreadParallelRunnerCreate(NULL, n_runners);
if (!runner)
goto quit;
@@ -235,7 +236,7 @@
size_t buf_len, i, npix;
#if MAX_RUNNERS > 0
- size_t n_runners;
+ unsigned int n_runners;
JxlParallelRunner *runner = NULL;
#endif
@@ -249,7 +250,7 @@
n_runners = JxlThreadParallelRunnerDefaultNumWorkerThreads();
if (n_runners > MAX_RUNNERS)
n_runners = MAX_RUNNERS;
- D("n_runners = %ld\n", n_runners);
+ D("n_runners = %d\n", n_runners);
runner = JxlThreadParallelRunnerCreate(NULL, n_runners);
if (!runner)
goto quit;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/loaders/loader_png.c
new/imlib2-1.12.1/src/modules/loaders/loader_png.c
--- old/imlib2-1.12.0/src/modules/loaders/loader_png.c 2023-08-16
12:14:12.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/loaders/loader_png.c 2023-09-21
09:39:48.000000000 +0200
@@ -86,7 +86,7 @@
png_fctl_t fctl;
png_fdat_t fdat;
};
- uint32_t crc; // Misplaced - just indication
+// uint32_t crc; // Misplaced - just indication
} png_chunk_t;
typedef struct {
@@ -284,7 +284,6 @@
png_structp png_ptr = NULL;
png_infop info_ptr = NULL;
ctx_t ctx = { 0 };
- int ic;
unsigned char *fptr;
const png_chunk_t *chunk;
const png_fctl_t *pfctl;
@@ -339,14 +338,17 @@
fptr = (unsigned char *)im->fi->fdata;
fptr += _PNG_SIG_SIZE;
seen_actl = false;
+#ifdef IMLIB2_DEBUG
+ int ic = 0;
+#endif
- for (ic = 0;; ic++, fptr += 8 + len + 4)
+ for (;; fptr += 8 + len + 4)
{
chunk = PCAST(const png_chunk_t *, fptr);
len = htonl(chunk->hdr.len);
- D("Scan %3d: %06lx: %6d: %.4s: ", ic,
- fptr - (unsigned char *)im->fi->fdata, len, chunk->hdr.name);
+ D("Scan %3d: %06lx: %6d: %.4s: ", ic++,
+ (long)(fptr - (unsigned char *)im->fi->fdata), len, chunk->hdr.name);
if (!mm_check(fptr + len))
break;
@@ -428,14 +430,17 @@
png_process_data(png_ptr, info_ptr, fptr, _PNG_SIG_SIZE);
fptr += _PNG_SIG_SIZE;
+#ifdef IMLIB2_DEBUG
+ ic = 0;
+#endif
- for (ic = 0;; ic++, fptr += 8 + len + 4)
+ for (;; fptr += 8 + len + 4)
{
chunk = PCAST(const png_chunk_t *, fptr);
len = htonl(chunk->hdr.len);
- D("Chunk %3d: %06lx: %6d: %.4s: ", ic,
- fptr - (unsigned char *)im->fi->fdata, len, chunk->hdr.name);
+ D("Chunk %3d: %06lx: %6d: %.4s: ", ic++,
+ (long)(fptr - (unsigned char *)im->fi->fdata), len, chunk->hdr.name);
if (!mm_check(fptr + len))
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/loaders/loader_raw.c
new/imlib2-1.12.1/src/modules/loaders/loader_raw.c
--- old/imlib2-1.12.0/src/modules/loaders/loader_raw.c 2023-08-16
12:14:12.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/loaders/loader_raw.c 2023-09-03
20:16:07.000000000 +0200
@@ -128,4 +128,4 @@
return rc;
}
-IMLIB_LOADER(_formats, _load, NULL);
+IMLIB_LOADER_KEEP(_formats, _load, NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/src/modules/loaders/loader_tiff.c
new/imlib2-1.12.1/src/modules/loaders/loader_tiff.c
--- old/imlib2-1.12.0/src/modules/loaders/loader_tiff.c 2023-07-02
21:33:39.000000000 +0200
+++ new/imlib2-1.12.1/src/modules/loaders/loader_tiff.c 2023-09-03
17:11:21.000000000 +0200
@@ -25,7 +25,7 @@
static tmsize_t
_tiff_read(thandle_t ctx, void *buf, tmsize_t len)
{
- DD("%s: len=%ld\n", __func__, len);
+ DD("%s: len=%ld\n", __func__, (long)len);
if (mdata.dptr + len > mdata.data + mdata.size)
return 0; /* Out of data */
@@ -39,7 +39,7 @@
static tmsize_t
_tiff_write(thandle_t ctx, void *buf, tmsize_t len)
{
- DD("%s: len=%ld\n", __func__, len);
+ DD("%s: len=%ld\n", __func__, (long)len);
return 0;
}
@@ -49,7 +49,7 @@
{
const unsigned char *dptr;
- DD("%s: offs=%ld, whence=%d\n", __func__, offs, whence);
+ DD("%s: offs=%ld, whence=%d\n", __func__, (long)offs, whence);
switch (whence)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imlib2-1.12.0/test/Makefile.in
new/imlib2-1.12.1/test/Makefile.in
--- old/imlib2-1.12.0/test/Makefile.in 2023-08-17 16:48:08.000000000 +0200
+++ new/imlib2-1.12.1/test/Makefile.in 2023-09-21 16:51:08.000000000 +0200
@@ -87,7 +87,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = /local/stuff/src/E/git/legacy/imlib2/build/default/imlib2-1.12.0/test
+subdir = /local/stuff/src/E/git/legacy/imlib2/build/default/imlib2-1.12.1/test
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ec_asan.m4 \
$(top_srcdir)/m4/ec_packing.m4 \
@@ -318,9 +318,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
/local/stuff/src/E/git/legacy/imlib2/build/default/imlib2-1.12.0/test/Makefile';
\
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
/local/stuff/src/E/git/legacy/imlib2/build/default/imlib2-1.12.1/test/Makefile';
\
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign
/local/stuff/src/E/git/legacy/imlib2/build/default/imlib2-1.12.0/test/Makefile
+ $(AUTOMAKE) --foreign
/local/stuff/src/E/git/legacy/imlib2/build/default/imlib2-1.12.1/test/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
