From 0c6fe367a7009c5bbabc3071f8cccc77a37859eb Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sun, 12 Jan 2020 12:08:26 +0100 Subject: 20200112.1 global branch merge. Signed-off-by: Matteo Bernardini --- .../patches/iscan-2.30.3_x86-unknown-types.patch | 12 +++++ system/iscan/patches/iscan_png15.patch | 52 ++++++++++++++++++++++ system/iscan/patches/jpegstream.cc.patch | 21 +++++++++ 3 files changed, 85 insertions(+) create mode 100644 system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch create mode 100644 system/iscan/patches/iscan_png15.patch create mode 100644 system/iscan/patches/jpegstream.cc.patch (limited to 'system/iscan/patches') diff --git a/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch b/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch new file mode 100644 index 0000000000..9bb856ff83 --- /dev/null +++ b/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch @@ -0,0 +1,12 @@ +diff -ru a/sanei/sanei_pio.c b/sanei/sanei_pio.c +--- a/sanei/sanei_pio.c 2019-03-01 10:44:36.723260142 -0600 ++++ b/sanei/sanei_pio.c 2019-03-01 10:48:47.660693036 -0600 +@@ -73,6 +73,7 @@ + #elif HAVE_SYS_HW_H + # include + #elif defined(__i386__) && defined (__GNUC__) ++#include + + static __inline__ void + outb (u_char value, u_long port) + diff --git a/system/iscan/patches/iscan_png15.patch b/system/iscan/patches/iscan_png15.patch new file mode 100644 index 0000000000..8220ac4af3 --- /dev/null +++ b/system/iscan/patches/iscan_png15.patch @@ -0,0 +1,52 @@ +# +# Thanks to Fabio Castelli, ArchLinux: +# https://projects.archlinux.org/svntogit/community.git/tree/trunk/libpng15.patch?h=packages/iscan +# +--- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100 ++++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100 +@@ -83,7 +83,12 @@ + #if HAVE_PNG_H + set_error_handler (_png, _info); + ++/* when not interlacing (ie, only one pass), number of rows is image height: _v_sz */ ++#if PNG_LIBPNG_VER > 10499 ++ if (!_footer && _v_sz == lib->get_current_row_number(_png)) ++#else + if (_header && !_footer && _png->num_rows == _png->flush_rows) ++#endif + { + lib->write_end (_png, _info); + _footer = true; +@@ -167,6 +172,9 @@ + funcsym (write_row); + funcsym (write_flush); + funcsym (write_end); ++#if PNG_LIBPNG_VER > 10499 ++ funcsym (get_current_row_number); ++#endif + + if (lib->access_version_number + && lib->create_write_struct +@@ -176,6 +184,9 @@ + && lib->set_IHDR + && lib->set_pHYs + && lib->set_invert_mono ++#if PNG_LIBPNG_VER > 10499 ++ && lib->get_current_row_number ++#endif + && lib->write_info + && lib->write_row + && lib->write_flush +--- lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100 ++++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100 +@@ -108,6 +108,10 @@ + png_structp); + fundecl (void, write_end, + png_structp, png_infop); ++#if PNG_LIBPNG_VER > 10499 ++ fundecl (png_uint_32, get_current_row_number, ++ png_structp); ++#endif + #endif /* HAVE_PNG_H */ + }; + static png_lib_handle *lib; diff --git a/system/iscan/patches/jpegstream.cc.patch b/system/iscan/patches/jpegstream.cc.patch new file mode 100644 index 0000000000..988a25daea --- /dev/null +++ b/system/iscan/patches/jpegstream.cc.patch @@ -0,0 +1,21 @@ +--- lib/jpegstream.cc.orig 2016-06-20 06:10:38.000000000 +0200 ++++ lib/jpegstream.cc 2016-07-10 18:45:40.511301054 +0200 +@@ -33,7 +33,7 @@ + + #include "jpegstream.hh" + +-#include ++// #include + #include + + namespace iscan +@@ -82,7 +82,8 @@ + // only that _bits != 8. + for (unsigned int i = 0; i < _h_sz; ++i) + { +- div_t index = div (i, 8 * sizeof (JSAMPLE)); ++ div_t index = div (static_cast(i), ++ static_cast(8 * sizeof (JSAMPLE))); + int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem; + _scanline[i] = ((line[index.quot] & (1 << offset)) + ? 0 : ~0); -- cgit v1.2.3