scm-commits July 2018

scm-commits@lists.fedoraproject.org

1 participants
46522 discussions

gd uploaded samba-4.9.0rc2.tar.xz for rpms/samba
by notifications＠fedoraproject.org 31 Jul '18

31 Jul '18

Notification time stamped 2018-07-31 22:57:41 UTC 0c80b2d24fce0b52ba8983e60def2ff783084abba30e2aa51829a277791faf6005f856abd4cffd34a83b209ecdd00a49194e7161a5ca0267abb2b057d9619113 samba-4.9.0rc2.tar.xz https://src.fedoraproject.org/lookaside/pkgs/rpms/samba/samba-4.9.0rc2.tar.…

1 0

irina pushed to rubygem-qpid_proton (f27). "0.24.0-1"
by notifications＠fedoraproject.org 31 Jul '18

31 Jul '18

Notification time stamped 2018-07-31 22:54:21 UTC From c90aa51764507906a7990ce1e08b2c7a1149d345 Mon Sep 17 00:00:00 2001 From: Irina Boverman <iboverma(a)redhat.com> Date: Jul 31 2018 22:54:07 +0000 Subject: 0.24.0-1 --- diff --git a/sources b/sources index 966cb30..dc784f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qpid_proton-0.21.0.gem) = 12313147c7f7e8e8f3c2c6f64bf1b148a79939b9a7490b873aa72f556e8ade0b9141b0eb15a0f897373799c76955f7b28fa660ec4c68c40a0c4e6581963c8981 +SHA512 (qpid_proton-0.24.0.gem) = 2b139980655193721685481b6e00c3d7d32c608b75b0515512a2b5a9c828c910922ba3a9a14fe7645de2a0b087089ec095e8c864651caf68d12f71a5e6a967fe https://src.fedoraproject.org/rpms/rubygem-qpid_proton/c/c90aa51764507906a7…

1 0

irina pushed to rubygem-qpid_proton (f27). "0.24.0-1"
by notifications＠fedoraproject.org 31 Jul '18

31 Jul '18

Notification time stamped 2018-07-31 22:47:03 UTC From 376f8d8c283f8c2e37031050b68fdadcd0bb3335 Mon Sep 17 00:00:00 2001 From: Irina Boverman <iboverma(a)redhat.com> Date: Jul 31 2018 22:46:48 +0000 Subject: 0.24.0-1 --- diff --git a/licenses.xml b/licenses.xml new file mode 100644 index 0000000..c8c5fdf --- /dev/null +++ b/licenses.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<licenseSummary> + <dependencies> + <dependency> + <packageName>qpid_proton</packageName> + <version>0.24.0</version> + <licenses> + <license> + <name>ASL 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> + </dependency> + </dependencies> +</licenseSummary> diff --git a/rubygem-qpid_proton.spec b/rubygem-qpid_proton.spec index 1454989..fa89ca1 100644 --- a/rubygem-qpid_proton.spec +++ b/rubygem-qpid_proton.spec @@ -1,17 +1,18 @@ # Generated from qpid_proton-0.0.1.gem by gem2rpm -*- rpm-spec -*- %global gem_name qpid_proton -%global proton_version 0.21.0 +%global proton_version 0.24.0 %{!?gem_extdir_mri: %global gem_extdir_mri %{_libdir}/gems/ruby/%{gem_name}-%{version}} Summary: Ruby language bindings for the Qpid Proton messaging framework Name: rubygem-%{gem_name} -Version: 0.21.0 +Version: %{proton_version} Release: 1%{?dist} License: ASL 2.0 URL: http://qpid.apache.org/proton -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem +Source0: http://rubygems.org/gems/%{gem_name}-%{proton_version}.gem +Source1: licenses.xml %if 0%{?fedora} > 0 BuildRequires: ruby(release) @@ -27,6 +28,7 @@ BuildRequires: make Requires: qpid-proton-c >= %{proton_version} + %description Proton is a high performance, lightweight messaging library. It can be used in the widest range of messaging applications including brokers, client libraries, @@ -69,6 +71,7 @@ mkdir -p %{buildroot}%{gem_extdir_mri} cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/ %endif +install -pm 644 %{SOURCE1} %{buildroot}%{gem_instdir}/ rm -rf %{buildroot}%{gem_instdir}/ext @@ -81,16 +84,18 @@ rm -rf %{buildroot}%{gem_instdir}/ext %{gem_extdir_mri} %exclude %{gem_cache} %{gem_spec} -%doc %{gem_instdir}/LICENSE +%doc %{gem_instdir}/LICENSE.txt +%doc %{gem_instdir}/licenses.xml %doc %{gem_instdir}/examples %doc %{gem_instdir}/tests %files doc %doc %{gem_docdir} -%doc %{gem_instdir}/ChangeLog -%doc %{gem_instdir}/TODO %changelog +* Tue Jul 24 2018 Irina Boverman <iboverma(a)redhat.com> - 0.24.0-1 +- Rebased to 0.24.0 + * Tue Mar 13 2018 Irina Boverman <iboverma(a)redhat.com> - 0.21.0-1 - Rebased to 0.21.0 https://src.fedoraproject.org/rpms/rubygem-qpid_proton/c/376f8d8c283f8c2e37…

1 0

mharmsen pushed to pki-core (f27). "Resolves: dogtagpki Pagure Issues #2915 (..more)"
by notifications＠fedoraproject.org 31 Jul '18

31 Jul '18

Notification time stamped 2018-07-31 22:40:46 UTC From 5ee81d872d708f8ebbad039d2192cc358c102405 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen <mharmsen(a)redhat.com> Date: Jul 31 2018 22:40:26 +0000 Subject: Resolves: dogtagpki Pagure Issues #2915 - dogtagpki Pagure Issue #2915 - keyGen fails when only Identity certificate exists (jmagne) --- diff --git a/.gitignore b/.gitignore index 8bdfbb3..292f1b4 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /pki-core-10.5.8.tar.gz /pki-core-10.5.9.tar.gz /pki-core-10.5.10.tar.gz +/pki-core-10.5.11.tar.gz diff --git a/pki-core.spec b/pki-core.spec index a006fa5..73753d6 100644 --- a/pki-core.spec +++ b/pki-core.spec @@ -66,12 +66,12 @@ Name: pki-core %if 0%{?rhel} Version: 10.5.9 -%define redhat_release 2 +%define redhat_release 4 %define redhat_stage 0 #%define default_release %{redhat_release}.%{redhat_stage} %define default_release %{redhat_release} %else -Version: 10.5.10 +Version: 10.5.11 %define fedora_release 1 %define fedora_stage 0 #%define default_release %{fedora_release}.%{fedora_stage} @@ -1336,6 +1336,10 @@ fi %endif # %{with server} %changelog +* Tue Jul 31 2018 Dogtag Team <pki-devel(a)redhat.com> 10.5.11-1 +- dogtagpki Pagure Issue #2915 - keyGen fails when only Identity + certificate exists (jmagne) + * Mon Jul 2 2018 Dogtag Team <pki-devel(a)redhat.com> 10.5.10-1 - Updated "jss" build and runtime requirements (mharmsen) - Updated "tomcatjss" build and runtime requirements (mharmsen) diff --git a/sources b/sources index cf27d78..b80e0d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pki-core-10.5.10.tar.gz) = 32f92e01d199bffc47221606b7e625839732f3f04d1848f73467b66da212758933cd1e1b30ceaadbe8e4c9c113c3398af94b3cb744a0e23ff3c19d5ed566b029 +SHA512 (pki-core-10.5.11.tar.gz) = 69ab30c4a89adaefebb641d59f6c0a72a3fbd86697a3ab10e67f5d37d2bde9d42e87e1631a5a901db5546b6595a20d7fdf84039227f93f1a46fe0a31b42123b8 https://src.fedoraproject.org/rpms/pki-core/c/5ee81d872d708f8ebbad039d2192c…

1 0

mharmsen uploaded pki-core-10.5.11.tar.gz for rpms/pki-core
by notifications＠fedoraproject.org 31 Jul '18

31 Jul '18

Notification time stamped 2018-07-31 22:40:03 UTC 69ab30c4a89adaefebb641d59f6c0a72a3fbd86697a3ab10e67f5d37d2bde9d42e87e1631a5a901db5546b6595a20d7fdf84039227f93f1a46fe0a31b42123b8 pki-core-10.5.11.tar.gz https://src.fedoraproject.org/lookaside/pkgs/rpms/pki-core/pki-core-10.5.11…

1 0

crobinso pushed to qemu (master). "Fix s390x file removal (..more)"
by notifications＠fedoraproject.org 31 Jul '18

31 Jul '18

Notification time stamped 2018-07-31 22:39:21 UTC From 5bdb061bca98179b74bf76dabd7c5a8abeca203c Mon Sep 17 00:00:00 2001 From: Cole Robinson <crobinso(a)redhat.com> Date: Jul 31 2018 22:39:03 +0000 Subject: Fix s390x file removal Only install modprobe kvm.conf on x86 (bz #1517989) --- diff --git a/kvm-x86.modprobe.conf b/kvm-x86.modprobe.conf new file mode 100644 index 0000000..84885e9 --- /dev/null +++ b/kvm-x86.modprobe.conf @@ -0,0 +1,11 @@ +### +### This configuration file was provided by the qemu package. +### Feel free to update as needed. +### + +### +### Set these options to enable nested virtualization +### + +#options kvm_intel nested=1 +#options kvm_amd nested=1 diff --git a/kvm.conf b/kvm.conf deleted file mode 100644 index 84885e9..0000000 --- a/kvm.conf +++ /dev/null @@ -1,11 +0,0 @@ -### -### This configuration file was provided by the qemu package. -### Feel free to update as needed. -### - -### -### Set these options to enable nested virtualization -### - -#options kvm_intel nested=1 -#options kvm_amd nested=1 diff --git a/qemu.spec b/qemu.spec index 99e8bc8..053f17a 100644 --- a/qemu.spec +++ b/qemu.spec @@ -130,8 +130,8 @@ Source13: qemu-kvm.sh # PR manager service Source14: qemu-pr-helper.service Source15: qemu-pr-helper.socket -# /etc/modprobe.d/kvm.conf -Source20: kvm.conf +# /etc/modprobe.d/kvm.conf, for x86 +Source20: kvm-x86.modprobe.conf # /etc/security/limits.d/95-kvm-ppc64-memlock.conf Source21: 95-kvm-ppc64-memlock.conf @@ -961,8 +961,6 @@ install -D -p -m 0644 %{_sourcedir}/ksmtuned.service %{buildroot}%{_unitdir} install -D -p -m 0755 %{_sourcedir}/ksmtuned %{buildroot}%{_sbindir}/ksmtuned install -D -p -m 0644 %{_sourcedir}/ksmtuned.conf %{buildroot}%{_sysconfdir}/ksmtuned.conf -install -D -p -m 0644 %{_sourcedir}/kvm.conf %{buildroot}%{_sysconfdir}/modprobe.d/kvm.conf - # Install qemu-guest-agent service and udev rules install -m 0644 %{_sourcedir}/qemu-guest-agent.service %{buildroot}%{_unitdir} install -m 0644 %{_sourcedir}/qemu-ga.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/qemu-ga @@ -978,11 +976,6 @@ touch %{buildroot}%{_localstatedir}/log/qga-fsfreeze-hook.log install -m 0644 %{_sourcedir}/qemu-pr-helper.service %{buildroot}%{_unitdir} install -m 0644 %{_sourcedir}/qemu-pr-helper.socket %{buildroot}%{_unitdir} -%ifarch s390x -install -d %{buildroot}%{_sysconfdir}/sysctl.d -install -m 0644 %{_sourcedir}/50-kvm-s390x.conf %{buildroot}%{_sysconfdir}/sysctl.d -%endif - %ifarch %{power64} install -d %{buildroot}%{_sysconfdir}/security/limits.d install -m 0644 %{_sourcedir}/95-kvm-ppc64-memlock.conf %{buildroot}%{_sysconfdir}/security/limits.d @@ -1032,6 +1025,7 @@ done %if 0%{?need_qemu_kvm} install -m 0755 %{_sourcedir}/qemu-kvm.sh %{buildroot}%{_bindir}/qemu-kvm ln -sf qemu.1.gz %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz +install -D -p -m 0644 %{_sourcedir}/kvm-x86.modprobe.conf %{buildroot}%{_sysconfdir}/modprobe.d/kvm.conf %endif install -D -p -m 0644 qemu.sasl %{buildroot}%{_sysconfdir}/sasl2/qemu.conf @@ -1259,7 +1253,6 @@ getent passwd qemu >/dev/null || \ %{_unitdir}/qemu-pr-helper.socket %attr(4755, root, root) %{_libexecdir}/qemu-bridge-helper %config(noreplace) %{_sysconfdir}/sasl2/qemu.conf -%config(noreplace) %{_sysconfdir}/modprobe.d/kvm.conf %dir %{_sysconfdir}/qemu %config(noreplace) %{_sysconfdir}/qemu/bridge.conf %dir %{_libdir}/qemu @@ -1650,6 +1643,7 @@ getent passwd qemu >/dev/null || \ %if 0%{?need_qemu_kvm} %{_bindir}/qemu-kvm %{_mandir}/man1/qemu-kvm.1* +%config(noreplace) %{_sysconfdir}/modprobe.d/kvm.conf %endif @@ -1666,6 +1660,7 @@ getent passwd qemu >/dev/null || \ * Tue Jul 31 2018 Cole Robinson <crobinso(a)redhat.com> - 2:3.0.0-0.1.rc3 - Rebase to qemu-3.0.0-rc3 - Drop now unneeded s390x conf (bz #1609706) +- Only install modprobe kvm.conf on x86 (bz #1517989) * Fri Jul 13 2018 Peter Robinson <pbrobinson(a)fedoraproject.org> 2:2.12.0-4 - Rebuild for Xen 4.11 https://src.fedoraproject.org/rpms/qemu/c/5bdb061bca98179b74bf76dabd7c5a8ab…

1 0

alexpl pushed to scidavis (f28). "Bump version to resolve conflict"
by notifications＠fedoraproject.org 31 Jul '18

31 Jul '18

Notification time stamped 2018-07-31 22:34:57 UTC This commit already existed in another branch. https://src.fedoraproject.org/rpms/scidavis/c/296f8e98d70a9ceafbf744670f120…

1 0

alexpl pushed to scidavis (f27). "Bump version to resolve conflict"
by notifications＠fedoraproject.org 31 Jul '18

31 Jul '18

Notification time stamped 2018-07-31 22:34:57 UTC From 296f8e98d70a9ceafbf744670f12075179b53a16 Mon Sep 17 00:00:00 2001 From: Alexander Ploumistos <alexpl(a)fedoraproject.org> Date: Jul 31 2018 22:33:55 +0000 Subject: Bump version to resolve conflict --- diff --git a/scidavis.spec b/scidavis.spec index 528caa7..a0ac9c4 100644 --- a/scidavis.spec +++ b/scidavis.spec @@ -8,7 +8,7 @@ Name: scidavis Version: 1.23 -Release: 6.%{gitdate}git%{shorttag}%{?dist} +Release: 7.%{gitdate}git%{shorttag}%{?dist} Summary: Application for Scientific Data Analysis and Visualization License: GPLv3+ @@ -150,9 +150,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %changelog -* Wed Aug 01 2018 Alexander Ploumistos <alexpl(a)fedoraproject.org> - 1.23-6.20180705git0ca8811 +* Wed Aug 01 2018 Alexander Ploumistos <alexpl(a)fedoraproject.org> - 1.23-7.20180705git0ca8811 - Fix an interface crash - patch by Miquel Garriga +* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.23-6.20180705git0ca8811 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Jul 08 2018 Alexander Ploumistos <alexpl(a)fedoraproject.org> - 1.23-5.20180705git0ca8811 - Switch to git snapshot 0ca8811 (multiple fixes) - Clean up spec file and unneeded patches https://src.fedoraproject.org/rpms/scidavis/c/296f8e98d70a9ceafbf744670f120…

1 0

alexpl pushed to scidavis (master). "Bump version to resolve conflict"
by notifications＠fedoraproject.org 31 Jul '18

31 Jul '18

Notification time stamped 2018-07-31 22:34:57 UTC This commit already existed in another branch. https://src.fedoraproject.org/rpms/scidavis/c/296f8e98d70a9ceafbf744670f120…

1 0

smani pushed to freeimage (master). "Update to 3.18.0"
by notifications＠fedoraproject.org 31 Jul '18

31 Jul '18

Notification time stamped 2018-07-31 22:32:07 UTC From fc41dd11c6506ce4b5372a61c7ac41263e25c5f9 Mon Sep 17 00:00:00 2001 From: Sandro Mani <manisandro(a)gmail.com> Date: Jul 31 2018 22:31:57 +0000 Subject: Update to 3.18.0 --- diff --git a/.gitignore b/.gitignore index fe36b64..8c82319 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ FreeImage3100.zip /FreeImage3170.zip +/FreeImage3180.zip diff --git a/FreeImage-3.17.0_CVE-2015-0852.patch b/FreeImage-3.17.0_CVE-2015-0852.patch deleted file mode 100644 index 19ec93a..0000000 --- a/FreeImage-3.17.0_CVE-2015-0852.patch +++ /dev/null @@ -1,216 +0,0 @@ -diff -rupN FreeImage/Source/FreeImage/PluginPCX.cpp FreeImage-new/Source/FreeImage/PluginPCX.cpp ---- FreeImage/Source/FreeImage/PluginPCX.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginPCX.cpp 2015-09-05 02:44:55.429436425 +0200 -@@ -30,7 +30,7 @@ - // Constants + headers - // ---------------------------------------------------------- - --#define IO_BUF_SIZE 2048 -+#define PCX_IO_BUF_SIZE 2048 - - // ---------------------------------------------------------- - -@@ -120,17 +120,17 @@ readline(FreeImageIO &io, fi_handle hand - - while (length--) { - if (count == 0) { -- if (*ReadPos >= IO_BUF_SIZE - 1 ) { -- if (*ReadPos == IO_BUF_SIZE - 1) { -+ if (*ReadPos >= PCX_IO_BUF_SIZE - 1 ) { -+ if (*ReadPos == PCX_IO_BUF_SIZE - 1) { - // we still have one BYTE, copy it to the start pos - -- *ReadBuf = ReadBuf[IO_BUF_SIZE - 1]; -+ *ReadBuf = ReadBuf[PCX_IO_BUF_SIZE - 1]; - -- io.read_proc(ReadBuf + 1, 1, IO_BUF_SIZE - 1, handle); -+ io.read_proc(ReadBuf + 1, 1, PCX_IO_BUF_SIZE - 1, handle); - } else { - // read the complete buffer - -- io.read_proc(ReadBuf, 1, IO_BUF_SIZE, handle); -+ io.read_proc(ReadBuf, 1, PCX_IO_BUF_SIZE, handle); - } - - *ReadPos = 0; -@@ -346,19 +346,9 @@ Load(FreeImageIO *io, fi_handle handle, - BOOL header_only = (flags & FIF_LOAD_NOPIXELS) == FIF_LOAD_NOPIXELS; - - try { -- // check PCX identifier -- -- long start_pos = io->tell_proc(handle); -- BOOL validated = pcx_validate(io, handle); -- io->seek_proc(handle, start_pos, SEEK_SET); -- if(!validated) { -- throw FI_MSG_ERROR_MAGIC_NUMBER; -- } -- -- // process the header -- - PCXHEADER header; - -+ // process the header - if(io->read_proc(&header, sizeof(PCXHEADER), 1, handle) != 1) { - throw FI_MSG_ERROR_PARSING; - } -@@ -366,20 +356,38 @@ Load(FreeImageIO *io, fi_handle handle, - SwapHeader(&header); - #endif - -- // allocate a new DIB -+ // process the window -+ const WORD *window = header.window; // left, upper, right,lower pixel coord. -+ const int left = window[0]; -+ const int top = window[1]; -+ const int right = window[2]; -+ const int bottom = window[3]; - -- unsigned width = header.window[2] - header.window[0] + 1; -- unsigned height = header.window[3] - header.window[1] + 1; -- unsigned bitcount = header.bpp * header.planes; -- -- if (bitcount == 24) { -- dib = FreeImage_AllocateHeader(header_only, width, height, bitcount, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); -- } else { -- dib = FreeImage_AllocateHeader(header_only, width, height, bitcount); -+ // check image size -+ if((left >= right) || (top >= bottom)) { -+ throw FI_MSG_ERROR_PARSING; - } - -- // if the dib couldn't be allocated, throw an error -+ const unsigned width = right - left + 1; -+ const unsigned height = bottom - top + 1; -+ const unsigned bitcount = header.bpp * header.planes; - -+ // allocate a new dib -+ switch(bitcount) { -+ case 1: -+ case 4: -+ case 8: -+ dib = FreeImage_AllocateHeader(header_only, width, height, bitcount); -+ break; -+ case 24: -+ dib = FreeImage_AllocateHeader(header_only, width, height, bitcount, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); -+ break; -+ default: -+ throw FI_MSG_ERROR_DIB_MEMORY; -+ break; -+ } -+ -+ // if the dib couldn't be allocated, throw an error - if (!dib) { - throw FI_MSG_ERROR_DIB_MEMORY; - } -@@ -426,19 +434,23 @@ Load(FreeImageIO *io, fi_handle handle, - - if (palette_id == 0x0C) { - BYTE *cmap = (BYTE*)malloc(768 * sizeof(BYTE)); -- io->read_proc(cmap, 768, 1, handle); - -- pal = FreeImage_GetPalette(dib); -- BYTE *pColormap = &cmap[0]; -+ if(cmap) { -+ io->read_proc(cmap, 768, 1, handle); - -- for(int i = 0; i < 256; i++) { -- pal[i].rgbRed = pColormap[0]; -- pal[i].rgbGreen = pColormap[1]; -- pal[i].rgbBlue = pColormap[2]; -- pColormap += 3; -+ pal = FreeImage_GetPalette(dib); -+ BYTE *pColormap = &cmap[0]; -+ -+ for(int i = 0; i < 256; i++) { -+ pal[i].rgbRed = pColormap[0]; -+ pal[i].rgbGreen = pColormap[1]; -+ pal[i].rgbBlue = pColormap[2]; -+ pColormap += 3; -+ } -+ -+ free(cmap); - } - -- free(cmap); - } - - // wrong palette ID, perhaps a gray scale is needed ? -@@ -463,12 +475,12 @@ Load(FreeImageIO *io, fi_handle handle, - return dib; - } - -- // calculate the line length for the PCX and the DIB -+ // calculate the line length for the PCX and the dib - - // length of raster line in bytes -- unsigned linelength = header.bytes_per_line * header.planes; -- // length of DIB line (rounded to DWORD) in bytes -- unsigned pitch = FreeImage_GetPitch(dib); -+ const unsigned linelength = header.bytes_per_line * header.planes; -+ // length of dib line (rounded to DWORD) in bytes -+ const unsigned pitch = FreeImage_GetPitch(dib); - - // run-length encoding ? - -@@ -478,14 +490,18 @@ Load(FreeImageIO *io, fi_handle handle, - // --------------- - - line = (BYTE*)malloc(linelength * sizeof(BYTE)); -- if(!line) throw FI_MSG_ERROR_MEMORY; -+ if(!line) { -+ throw FI_MSG_ERROR_MEMORY; -+ } - -- ReadBuf = (BYTE*)malloc(IO_BUF_SIZE * sizeof(BYTE)); -- if(!ReadBuf) throw FI_MSG_ERROR_MEMORY; -+ ReadBuf = (BYTE*)malloc(PCX_IO_BUF_SIZE * sizeof(BYTE)); -+ if(!ReadBuf) { -+ throw FI_MSG_ERROR_MEMORY; -+ } - - bits = FreeImage_GetScanLine(dib, height - 1); - -- int ReadPos = IO_BUF_SIZE; -+ int ReadPos = PCX_IO_BUF_SIZE; - - if ((header.planes == 1) && ((header.bpp == 1) || (header.bpp == 8))) { - BYTE skip; -@@ -497,7 +513,7 @@ Load(FreeImageIO *io, fi_handle handle, - // skip trailing garbage at the end of the scanline - - for (unsigned count = written; count < linelength; count++) { -- if (ReadPos < IO_BUF_SIZE) { -+ if (ReadPos < PCX_IO_BUF_SIZE) { - ReadPos++; - } else { - io->read_proc(&skip, sizeof(BYTE), 1, handle); -@@ -513,7 +529,9 @@ Load(FreeImageIO *io, fi_handle handle, - unsigned x, y, written; - - buffer = (BYTE*)malloc(width * sizeof(BYTE)); -- if(!buffer) throw FI_MSG_ERROR_MEMORY; -+ if(!buffer) { -+ throw FI_MSG_ERROR_MEMORY; -+ } - - for (y = 0; y < height; y++) { - written = readline(*io, handle, line, linelength, bIsRLE, ReadBuf, &ReadPos); -@@ -532,7 +550,7 @@ Load(FreeImageIO *io, fi_handle handle, - } - } - -- // then write the DIB row -+ // then write the dib row - - for (x = 0; x < width / 2; x++) { - bits[x] = (buffer[2*x] << 4) | buffer[2*x+1]; -@@ -541,7 +559,7 @@ Load(FreeImageIO *io, fi_handle handle, - // skip trailing garbage at the end of the scanline - - for (unsigned count = written; count < linelength; count++) { -- if (ReadPos < IO_BUF_SIZE) { -+ if (ReadPos < PCX_IO_BUF_SIZE) { - ReadPos++; - } else { - io->read_proc(&skip, sizeof(BYTE), 1, handle); diff --git a/FreeImage-3.17.0_CVE-2016-5684.patch b/FreeImage-3.17.0_CVE-2016-5684.patch deleted file mode 100644 index 1df2646..0000000 --- a/FreeImage-3.17.0_CVE-2016-5684.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -rupN FreeImage/Source/FreeImage/PluginXPM.cpp FreeImage-new/Source/FreeImage/PluginXPM.cpp ---- FreeImage/Source/FreeImage/PluginXPM.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginXPM.cpp 2016-10-04 16:40:11.975271194 +0200 -@@ -181,6 +181,11 @@ Load(FreeImageIO *io, fi_handle handle, - } - free(str); - -+ // check info string -+ if((width <= 0) || (height <= 0) || (colors <= 0) || (cpp <= 0)) { -+ throw "Improperly formed info string"; -+ } -+ - if (colors > 256) { - dib = FreeImage_AllocateHeader(header_only, width, height, 24, FI_RGBA_RED_MASK, FI_RGBA_GREEN_MASK, FI_RGBA_BLUE_MASK); - } else { -@@ -193,7 +198,7 @@ Load(FreeImageIO *io, fi_handle handle, - FILE_RGBA rgba; - - str = ReadString(io, handle); -- if(!str) -+ if(!str || (strlen(str) < (size_t)cpp)) - throw "Error reading color strings"; - - std::string chrs(str,cpp); //create a string for the color chars using the first cpp chars diff --git a/FreeImage-3.17.0_doxygen.patch b/FreeImage-3.17.0_doxygen.patch deleted file mode 100644 index cb0209d..0000000 --- a/FreeImage-3.17.0_doxygen.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -rupN FreeImage/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox FreeImage-new/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox ---- FreeImage/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox 2011-07-30 19:02:48.000000000 +0200 -+++ FreeImage-new/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox 2015-09-05 02:10:36.890581408 +0200 -@@ -51,7 +51,7 @@ PROJECT_LOGO = - # If a relative path is entered, it will be relative to the location - # where doxygen was started. If left blank the current directory will be used. - --OUTPUT_DIRECTORY = D:/Projects/FreeImage/Wrapper/FreeImagePlus/ -+OUTPUT_DIRECTORY = . - - # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create - # 4096 sub-directories (in 2 levels) under the output directory of each output -@@ -598,7 +598,7 @@ WARN_FORMAT = "$file:$line: $ - # and error messages should be written. If left blank the output is written - # to stderr. - --WARN_LOGFILE = D:\Projects\FreeImage\Wrapper\FreeImagePlus\doc\doxygen.log -+WARN_LOGFILE = ./doxygen.log - - #--------------------------------------------------------------------------- - # configuration options related to the input files -@@ -609,8 +609,7 @@ WARN_LOGFILE = D:\Projects\Fre - # directories like "/usr/src/myproject". Separate the files or directories - # with spaces. - --INPUT = D:/Projects/FreeImage/Source/FreeImage.h \ -- D:/Projects/FreeImage/Wrapper/FreeImagePlus/FreeImagePlus.h -+INPUT = ../../../Source/FreeImage.h ../FreeImagePlus.h - - # This tag can be used to specify the character encoding of the source files - # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/FreeImage-3.17.0_unbundle.patch b/FreeImage-3.17.0_unbundle.patch deleted file mode 100644 index fe1540d..0000000 --- a/FreeImage-3.17.0_unbundle.patch +++ /dev/null @@ -1,665 +0,0 @@ -diff -rupN FreeImage/genfipsrclist.sh FreeImage-new/genfipsrclist.sh ---- FreeImage/genfipsrclist.sh 2015-02-20 10:52:16.000000000 +0100 -+++ FreeImage-new/genfipsrclist.sh 2018-07-15 22:29:55.447800377 +0200 -@@ -1,6 +1,6 @@ - #!/bin/sh - --DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib Wrapper/FreeImagePlus" -+DIRLIST="Wrapper/FreeImagePlus" - - - echo "VER_MAJOR = 3" > fipMakefile.srcs -@@ -19,5 +19,6 @@ echo -n "INCLUDE =" >> fipMakefile.srcs - for DIR in $DIRLIST; do - echo -n " -I$DIR" >> fipMakefile.srcs - done -+echo -n " -IDist" >> fipMakefile.srcs - echo >> fipMakefile.srcs - -diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh ---- FreeImage/gensrclist.sh 2015-02-20 10:51:50.000000000 +0100 -+++ FreeImage-new/gensrclist.sh 2018-07-15 22:29:55.449800377 +0200 -@@ -1,6 +1,6 @@ - #!/bin/sh - --DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib" -+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit" - - echo "VER_MAJOR = 3" > Makefile.srcs - echo "VER_MINOR = 17.0" >> Makefile.srcs -diff -rupN FreeImage/Makefile.fip FreeImage-new/Makefile.fip ---- FreeImage/Makefile.fip 2015-03-08 18:03:56.000000000 +0100 -+++ FreeImage-new/Makefile.fip 2018-07-15 22:29:55.450800377 +0200 -@@ -17,20 +17,22 @@ MODULES = $(SRCS:.c=.o) - MODULES := $(MODULES:.cpp=.o) - CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden - # OpenJPEG --CFLAGS += -DOPJ_STATIC -+override CFLAGS += -DOPJ_STATIC - # LibRaw --CFLAGS += -DNO_LCMS -+override CFLAGS += -DNO_LCMS - # LibJXR --CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ --CFLAGS += $(INCLUDE) -+override CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ -+override CFLAGS += $(INCLUDE) - CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy - # LibJXR --CXXFLAGS += -D__ANSI__ --CXXFLAGS += $(INCLUDE) -+override CXXFLAGS += -D__ANSI__ -+override CXXFLAGS += $(INCLUDE) -+LDFLAGS ?= -+override LDFLAGS += -LDist -lfreeimage-$(VER_MAJOR).$(VER_MINOR) - - ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) -- CFLAGS += -fPIC -- CXXFLAGS += -fPIC -+ override CFLAGS += -fPIC -+ override CXXFLAGS += -fPIC - endif - - TARGET = freeimageplus -@@ -68,7 +70,7 @@ $(STATICLIB): $(MODULES) - $(AR) r $@ $(MODULES) - - $(SHAREDLIB): $(MODULES) -- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) -+ $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) - - install: - install -d $(INCDIR) $(INSTALLDIR) -diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu ---- FreeImage/Makefile.gnu 2015-03-08 18:04:00.000000000 +0100 -+++ FreeImage-new/Makefile.gnu 2018-07-15 22:29:55.450800377 +0200 -@@ -16,21 +16,11 @@ LIBRARIES = -lstdc++ - MODULES = $(SRCS:.c=.o) - MODULES := $(MODULES:.cpp=.o) - CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden --# OpenJPEG --CFLAGS += -DOPJ_STATIC --# LibRaw --CFLAGS += -DNO_LCMS --# LibJXR --CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ --CFLAGS += $(INCLUDE) --CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy --# LibJXR --CXXFLAGS += -D__ANSI__ --CXXFLAGS += $(INCLUDE) -+override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib) -+override LDFLAGS += -ljpeg -ljpegxr -ljxrglue $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib) - - ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) -- CFLAGS += -fPIC -- CXXFLAGS += -fPIC -+ override CFLAGS += -fPIC - endif - - TARGET = freeimage -@@ -61,13 +51,13 @@ FreeImage: $(STATICLIB) $(SHAREDLIB) - $(CC) $(CFLAGS) -c $< -o $@ - - .cpp.o: -- $(CXX) $(CXXFLAGS) -c $< -o $@ -+ $(CXX) $(CFLAGS) -c $< -o $@ - - $(STATICLIB): $(MODULES) - $(AR) r $@ $(MODULES) - - $(SHAREDLIB): $(MODULES) -- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) -+ $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) - - install: - install -d $(INCDIR) $(INSTALLDIR) -diff -rupN FreeImage/Source/FreeImage/J2KHelper.cpp FreeImage-new/Source/FreeImage/J2KHelper.cpp ---- FreeImage/Source/FreeImage/J2KHelper.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/J2KHelper.cpp 2018-07-15 22:29:55.451800377 +0200 -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include <openjpeg.h> - #include "J2KHelper.h" - - // -------------------------------------------------------------------------- -diff -rupN FreeImage/Source/FreeImage/Plugin.cpp FreeImage-new/Source/FreeImage/Plugin.cpp ---- FreeImage/Source/FreeImage/Plugin.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/Plugin.cpp 2018-07-15 22:29:55.452800377 +0200 -@@ -263,7 +263,12 @@ FreeImage_Initialise(BOOL load_local_plu - s_plugins->AddNode(InitDDS); - s_plugins->AddNode(InitGIF); - s_plugins->AddNode(InitHDR); -- s_plugins->AddNode(InitG3); -+/* The G3 fax format plugin is deliberately disabled in the Fedora build of -+ FreeImage as it requires that FreeImage uses a private copy of libtiff -+ which is a no no because of security reasons. */ -+#if 0 -+ s_plugins->AddNode(InitG3); -+#endif - s_plugins->AddNode(InitSGI); - s_plugins->AddNode(InitEXR); - s_plugins->AddNode(InitJ2K); -diff -rupN FreeImage/Source/FreeImage/PluginEXR.cpp FreeImage-new/Source/FreeImage/PluginEXR.cpp ---- FreeImage/Source/FreeImage/PluginEXR.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginEXR.cpp 2018-07-15 22:29:55.453800377 +0200 -@@ -28,16 +28,16 @@ - #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning) - #endif - --#include "../OpenEXR/IlmImf/ImfIO.h" --#include "../OpenEXR/Iex/Iex.h" --#include "../OpenEXR/IlmImf/ImfOutputFile.h" --#include "../OpenEXR/IlmImf/ImfInputFile.h" --#include "../OpenEXR/IlmImf/ImfRgbaFile.h" --#include "../OpenEXR/IlmImf/ImfChannelList.h" --#include "../OpenEXR/IlmImf/ImfRgba.h" --#include "../OpenEXR/IlmImf/ImfArray.h" --#include "../OpenEXR/IlmImf/ImfPreviewImage.h" --#include "../OpenEXR/Half/half.h" -+#include <OpenEXR/ImfIO.h> -+#include <OpenEXR/Iex.h> -+#include <OpenEXR/ImfOutputFile.h> -+#include <OpenEXR/ImfInputFile.h> -+#include <OpenEXR/ImfRgbaFile.h> -+#include <OpenEXR/ImfChannelList.h> -+#include <OpenEXR/ImfRgba.h> -+#include <OpenEXR/ImfArray.h> -+#include <OpenEXR/ImfPreviewImage.h> -+#include <OpenEXR/half.h> - - - // ========================================================== -diff -rupN FreeImage/Source/FreeImage/PluginJ2K.cpp FreeImage-new/Source/FreeImage/PluginJ2K.cpp ---- FreeImage/Source/FreeImage/PluginJ2K.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginJ2K.cpp 2018-07-15 22:29:55.453800377 +0200 -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include <openjpeg.h> - #include "J2KHelper.h" - - // ========================================================== -diff -rupN FreeImage/Source/FreeImage/PluginJP2.cpp FreeImage-new/Source/FreeImage/PluginJP2.cpp ---- FreeImage/Source/FreeImage/PluginJP2.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginJP2.cpp 2018-07-15 22:29:55.454800377 +0200 -@@ -21,7 +21,7 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibOpenJPEG/openjpeg.h" -+#include <openjpeg.h> - #include "J2KHelper.h" - - // ========================================================== -diff -rupN FreeImage/Source/FreeImage/PluginJPEG.cpp FreeImage-new/Source/FreeImage/PluginJPEG.cpp ---- FreeImage/Source/FreeImage/PluginJPEG.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginJPEG.cpp 2018-07-15 22:29:55.454800377 +0200 -@@ -35,9 +35,9 @@ extern "C" { - #undef FAR - #include <setjmp.h> - --#include "../LibJPEG/jinclude.h" --#include "../LibJPEG/jpeglib.h" --#include "../LibJPEG/jerror.h" -+#include <stdio.h> -+#include <jpeglib.h> -+#include <jerror.h> - } - - #include "FreeImage.h" -@@ -485,116 +485,6 @@ marker_is_icc(jpeg_saved_marker_ptr mark - } - - /** -- See if there was an ICC profile in the JPEG file being read; -- if so, reassemble and return the profile data. -- -- TRUE is returned if an ICC profile was found, FALSE if not. -- If TRUE is returned, *icc_data_ptr is set to point to the -- returned data, and *icc_data_len is set to its length. -- -- IMPORTANT: the data at **icc_data_ptr has been allocated with malloc() -- and must be freed by the caller with free() when the caller no longer -- needs it. (Alternatively, we could write this routine to use the -- IJG library's memory allocator, so that the data would be freed implicitly -- at jpeg_finish_decompress() time. But it seems likely that many apps -- will prefer to have the data stick around after decompression finishes.) -- -- NOTE: if the file contains invalid ICC APP2 markers, we just silently -- return FALSE. You might want to issue an error message instead. --*/ --static BOOL --jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { -- jpeg_saved_marker_ptr marker; -- int num_markers = 0; -- int seq_no; -- JOCTET *icc_data; -- unsigned total_length; -- -- const int MAX_SEQ_NO = 255; // sufficient since marker numbers are bytes -- BYTE marker_present[MAX_SEQ_NO+1]; // 1 if marker found -- unsigned data_length[MAX_SEQ_NO+1]; // size of profile data in marker -- unsigned data_offset[MAX_SEQ_NO+1]; // offset for data in marker -- -- *icc_data_ptr = NULL; // avoid confusion if FALSE return -- *icc_data_len = 0; -- -- /** -- this first pass over the saved markers discovers whether there are -- any ICC markers and verifies the consistency of the marker numbering. -- */ -- -- memset(marker_present, 0, (MAX_SEQ_NO + 1)); -- -- for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) { -- if (marker_is_icc(marker)) { -- if (num_markers == 0) { -- // number of markers -- num_markers = GETJOCTET(marker->data[13]); -- } -- else if (num_markers != GETJOCTET(marker->data[13])) { -- return FALSE; // inconsistent num_markers fields -- } -- // sequence number -- seq_no = GETJOCTET(marker->data[12]); -- if (seq_no <= 0 || seq_no > num_markers) { -- return FALSE; // bogus sequence number -- } -- if (marker_present[seq_no]) { -- return FALSE; // duplicate sequence numbers -- } -- marker_present[seq_no] = 1; -- data_length[seq_no] = marker->data_length - ICC_HEADER_SIZE; -- } -- } -- -- if (num_markers == 0) -- return FALSE; -- -- /** -- check for missing markers, count total space needed, -- compute offset of each marker's part of the data. -- */ -- -- total_length = 0; -- for(seq_no = 1; seq_no <= num_markers; seq_no++) { -- if (marker_present[seq_no] == 0) { -- return FALSE; // missing sequence number -- } -- data_offset[seq_no] = total_length; -- total_length += data_length[seq_no]; -- } -- -- if (total_length <= 0) -- return FALSE; // found only empty markers ? -- -- // allocate space for assembled data -- icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET)); -- if (icc_data == NULL) -- return FALSE; // out of memory -- -- // and fill it in -- for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) { -- if (marker_is_icc(marker)) { -- JOCTET FAR *src_ptr; -- JOCTET *dst_ptr; -- unsigned length; -- seq_no = GETJOCTET(marker->data[12]); -- dst_ptr = icc_data + data_offset[seq_no]; -- src_ptr = marker->data + ICC_HEADER_SIZE; -- length = data_length[seq_no]; -- while (length--) { -- *dst_ptr++ = *src_ptr++; -- } -- } -- } -- -- *icc_data_ptr = icc_data; -- *icc_data_len = total_length; -- -- return TRUE; --} -- --/** - Read JPEG_APPD marker (IPTC or Adobe Photoshop profile) - */ - static BOOL -diff -rupN FreeImage/Source/FreeImage/PluginJXR.cpp FreeImage-new/Source/FreeImage/PluginJXR.cpp ---- FreeImage/Source/FreeImage/PluginJXR.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginJXR.cpp 2018-07-15 22:29:55.455800377 +0200 -@@ -23,7 +23,7 @@ - #include "Utilities.h" - #include "../Metadata/FreeImageTag.h" - --#include "../LibJXR/jxrgluelib/JXRGlue.h" -+#include <JXRGlue.h> - - // ========================================================== - // Plugin Interface -diff -rupN FreeImage/Source/FreeImage/PluginPNG.cpp FreeImage-new/Source/FreeImage/PluginPNG.cpp ---- FreeImage/Source/FreeImage/PluginPNG.cpp 2015-03-10 20:16:10.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginPNG.cpp 2018-07-15 22:29:55.455800377 +0200 -@@ -40,8 +40,8 @@ - - // ---------------------------------------------------------- - --#include "../ZLib/zlib.h" --#include "../LibPNG/png.h" -+#include <zlib.h> -+#include <png.h> - - // ---------------------------------------------------------- - -diff -rupN FreeImage/Source/FreeImage/PluginRAW.cpp FreeImage-new/Source/FreeImage/PluginRAW.cpp ---- FreeImage/Source/FreeImage/PluginRAW.cpp 2015-03-08 20:12:03.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginRAW.cpp 2018-07-15 22:29:55.455800377 +0200 -@@ -19,7 +19,7 @@ - // Use at your own risk! - // ========================================================== - --#include "../LibRawLite/libraw/libraw.h" -+#include <libraw/libraw.h> - - #include "FreeImage.h" - #include "Utilities.h" -diff -rupN FreeImage/Source/FreeImage/PluginTIFF.cpp FreeImage-new/Source/FreeImage/PluginTIFF.cpp ---- FreeImage/Source/FreeImage/PluginTIFF.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginTIFF.cpp 2018-07-15 22:29:55.456800377 +0200 -@@ -37,9 +37,9 @@ - - #include "FreeImage.h" - #include "Utilities.h" --#include "../LibTIFF4/tiffiop.h" -+#include <tiffio.h> - #include "../Metadata/FreeImageTag.h" --#include "../OpenEXR/Half/half.h" -+#include <OpenEXR/half.h> - - #include "FreeImageIO.h" - #include "PSDParser.h" -@@ -194,16 +194,6 @@ TIFFFdOpen(thandle_t handle, const char - return tif; - } - --/** --Open a TIFF file for reading or writing --@param name --@param mode --*/ --TIFF* --TIFFOpen(const char* name, const char* mode) { -- return 0; --} -- - // ---------------------------------------------------------- - // TIFF library FreeImage-specific routines. - // ---------------------------------------------------------- -diff -rupN FreeImage/Source/FreeImage/PluginWebP.cpp FreeImage-new/Source/FreeImage/PluginWebP.cpp ---- FreeImage/Source/FreeImage/PluginWebP.cpp 2015-03-02 02:07:08.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/PluginWebP.cpp 2018-07-15 22:29:55.456800377 +0200 -@@ -24,10 +24,10 @@ - - #include "../Metadata/FreeImageTag.h" - --#include "../LibWebP/src/webp/decode.h" --#include "../LibWebP/src/webp/encode.h" --#include "../LibWebP/src/enc/vp8enci.h" --#include "../LibWebP/src/webp/mux.h" -+#include <webp/decode.h> -+#include <webp/encode.h> -+// #include "../LibWebP/src/enc/vp8enci.h" -+#include <webp/mux.h> - - // ========================================================== - // Plugin Interface -diff -rupN FreeImage/Source/FreeImage/ZLibInterface.cpp FreeImage-new/Source/FreeImage/ZLibInterface.cpp ---- FreeImage/Source/FreeImage/ZLibInterface.cpp 2015-03-02 02:07:10.000000000 +0100 -+++ FreeImage-new/Source/FreeImage/ZLibInterface.cpp 2018-07-15 22:29:55.456800377 +0200 -@@ -19,10 +19,9 @@ - // Use at your own risk! - // ========================================================== - --#include "../ZLib/zlib.h" -+#include <zlib.h> - #include "FreeImage.h" - #include "Utilities.h" --#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */ - - /** - Compresses a source buffer into a target buffer, using the ZLib library. -@@ -115,7 +114,7 @@ FreeImage_ZLibGZip(BYTE *target, DWORD t - return 0; - case Z_OK: { - // patch header, setup crc and length (stolen from mod_trace_output) -- BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code -+ BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code (unix) - crc = crc32(crc, source, source_size); - memcpy(target + 4 + dest_len, &crc, 4); - memcpy(target + 8 + dest_len, &source_size, 4); -diff -rupN FreeImage/Source/FreeImage.h FreeImage-new/Source/FreeImage.h ---- FreeImage/Source/FreeImage.h 2015-03-04 02:17:54.000000000 +0100 -+++ FreeImage-new/Source/FreeImage.h 2018-07-15 22:29:55.457800377 +0200 -@@ -155,8 +155,11 @@ typedef uint8_t BYTE; - typedef uint16_t WORD; - typedef uint32_t DWORD; - typedef int32_t LONG; -+// Disable these, they conflict with the (wrong) ones of libraw -+#if 0 - typedef int64_t INT64; - typedef uint64_t UINT64; -+#endif - #else - // MS is not C99 ISO compliant - typedef long BOOL; -@@ -410,7 +413,12 @@ FI_ENUM(FREE_IMAGE_FORMAT) { - FIF_DDS = 24, - FIF_GIF = 25, - FIF_HDR = 26, -- FIF_FAXG3 = 27, -+/* The G3 fax format plugin is deliberately disabled in the Fedora build of -+ FreeImage as it requires that FreeImage uses a private copy of libtiff -+ which is a no no because of security reasons. */ -+#if 0 -+ FIF_FAXG3 = 27, -+#endif - FIF_SGI = 28, - FIF_EXR = 29, - FIF_J2K = 30, -@@ -473,6 +481,10 @@ FI_ENUM(FREE_IMAGE_DITHER) { - FID_BAYER16x16 = 6 //! Bayer ordered dispersed dot dithering (order 4 dithering matrix) - }; - -+/* The FreeImage_JPEGTransform functions are deliberately disabled in the -+ Fedora build of FreeImage as they require that FreeImage uses a private copy -+ of libjpeg which is a no no because of security reasons. */ -+#if 0 - /** Lossless JPEG transformations - Constants used in FreeImage_JPEGTransform - */ -@@ -486,6 +498,7 @@ FI_ENUM(FREE_IMAGE_JPEG_OPERATION) { - FIJPEG_OP_ROTATE_180 = 6, //! 180-degree rotation - FIJPEG_OP_ROTATE_270 = 7 //! 270-degree clockwise (or 90 ccw) - }; -+#endif - - /** Tone mapping operators. - Constants used in FreeImage_ToneMapping. -@@ -1076,7 +1089,10 @@ DLL_API const char* DLL_CALLCONV FreeIma - // -------------------------------------------------------------------------- - // JPEG lossless transformation routines - // -------------------------------------------------------------------------- -- -+/* The FreeImage_JPEGTransform functions are deliberately disabled in the -++ Fedora build of FreeImage as they require that FreeImage uses a private copy -++ of libjpeg which is a no no because of security reasons. */ -+#if 0 - DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE)); - DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE)); - DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom); -@@ -1085,6 +1101,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEG - DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); - DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); - DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); -+#endif - - - // -------------------------------------------------------------------------- -diff -rupN FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp FreeImage-new/Source/FreeImageToolkit/JPEGTransform.cpp ---- FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp 2015-03-02 02:07:10.000000000 +0100 -+++ FreeImage-new/Source/FreeImageToolkit/JPEGTransform.cpp 2018-07-15 22:29:55.457800377 +0200 -@@ -26,10 +26,10 @@ extern "C" { - #undef FAR - #include <setjmp.h> - --#include "../LibJPEG/jinclude.h" --#include "../LibJPEG/jpeglib.h" --#include "../LibJPEG/jerror.h" --#include "../LibJPEG/transupp.h" -+#include <jinclude.h> -+#include <jpeglib.h> -+#include <jerror.h> -+#include <transupp.h> - } - - #include "FreeImage.h" -diff -rupN FreeImage/Source/Metadata/TagConversion.cpp FreeImage-new/Source/Metadata/TagConversion.cpp ---- FreeImage/Source/Metadata/TagConversion.cpp 2015-03-02 02:07:10.000000000 +0100 -+++ FreeImage-new/Source/Metadata/TagConversion.cpp 2018-07-15 22:29:55.457800377 +0200 -@@ -30,6 +30,11 @@ - - #define MAX_TEXT_EXTENT 512 - -+// These were in FreeImage.h, but are moved here to avoid conflicts (see note in FreeImage.h) -+typedef int64_t INT64; -+typedef uint64_t UINT64; -+ -+ - /** - Convert a tag to a C string - */ -diff -rupN FreeImage/Source/Metadata/XTIFF.cpp FreeImage-new/Source/Metadata/XTIFF.cpp ---- FreeImage/Source/Metadata/XTIFF.cpp 2015-03-02 02:07:10.000000000 +0100 -+++ FreeImage-new/Source/Metadata/XTIFF.cpp 2018-07-15 22:29:55.458800377 +0200 -@@ -29,13 +29,18 @@ - #pragma warning (disable : 4786) // identifier was truncated to 'number' characters - #endif - --#include "../LibTIFF4/tiffiop.h" -+#include <tiffio.h> - - #include "FreeImage.h" - #include "Utilities.h" - #include "FreeImageTag.h" - #include "FIRational.h" - -+extern "C" -+{ -+ int _TIFFDataSize(TIFFDataType type); -+} -+ - // ---------------------------------------------------------- - // Extended TIFF Directory GEO Tag Support - // ---------------------------------------------------------- -@@ -224,6 +229,33 @@ tiff_write_geotiff_profile(TIFF *tif, FI - // TIFF EXIF tag reading & writing - // ---------------------------------------------------------- - -+static uint32 exif_tag_ids[] = { -+ EXIFTAG_EXPOSURETIME, EXIFTAG_FNUMBER, EXIFTAG_EXPOSUREPROGRAM, -+ EXIFTAG_SPECTRALSENSITIVITY, EXIFTAG_ISOSPEEDRATINGS, EXIFTAG_OECF, -+ EXIFTAG_EXIFVERSION, EXIFTAG_DATETIMEORIGINAL, EXIFTAG_DATETIMEDIGITIZED, -+ EXIFTAG_COMPONENTSCONFIGURATION, EXIFTAG_COMPRESSEDBITSPERPIXEL, -+ EXIFTAG_SHUTTERSPEEDVALUE, EXIFTAG_APERTUREVALUE, -+ EXIFTAG_BRIGHTNESSVALUE, EXIFTAG_EXPOSUREBIASVALUE, -+ EXIFTAG_MAXAPERTUREVALUE, EXIFTAG_SUBJECTDISTANCE, EXIFTAG_METERINGMODE, -+ EXIFTAG_LIGHTSOURCE, EXIFTAG_FLASH, EXIFTAG_FOCALLENGTH, -+ EXIFTAG_SUBJECTAREA, EXIFTAG_MAKERNOTE, EXIFTAG_USERCOMMENT, -+ EXIFTAG_SUBSECTIME, EXIFTAG_SUBSECTIMEORIGINAL, -+ EXIFTAG_SUBSECTIMEDIGITIZED, EXIFTAG_FLASHPIXVERSION, EXIFTAG_COLORSPACE, -+ EXIFTAG_PIXELXDIMENSION, EXIFTAG_PIXELYDIMENSION, -+ EXIFTAG_RELATEDSOUNDFILE, EXIFTAG_FLASHENERGY, -+ EXIFTAG_SPATIALFREQUENCYRESPONSE, EXIFTAG_FOCALPLANEXRESOLUTION, -+ EXIFTAG_FOCALPLANEYRESOLUTION, EXIFTAG_FOCALPLANERESOLUTIONUNIT, -+ EXIFTAG_SUBJECTLOCATION, EXIFTAG_EXPOSUREINDEX, EXIFTAG_SENSINGMETHOD, -+ EXIFTAG_FILESOURCE, EXIFTAG_SCENETYPE, EXIFTAG_CFAPATTERN, -+ EXIFTAG_CUSTOMRENDERED, EXIFTAG_EXPOSUREMODE, EXIFTAG_WHITEBALANCE, -+ EXIFTAG_DIGITALZOOMRATIO, EXIFTAG_FOCALLENGTHIN35MMFILM, -+ EXIFTAG_SCENECAPTURETYPE, EXIFTAG_GAINCONTROL, EXIFTAG_CONTRAST, -+ EXIFTAG_SATURATION, EXIFTAG_SHARPNESS, EXIFTAG_DEVICESETTINGDESCRIPTION, -+ EXIFTAG_SUBJECTDISTANCERANGE, EXIFTAG_GAINCONTROL, EXIFTAG_GAINCONTROL, -+ EXIFTAG_IMAGEUNIQUEID -+}; -+static int nExifTags = sizeof(exif_tag_ids) / sizeof(exif_tag_ids[0]); -+ - /** - Read a single Exif tag - -@@ -575,45 +607,11 @@ tiff_read_exif_tags(TIFF *tif, TagLib::M - - // loop over all Core Directory Tags - // ### uses private data, but there is no other way -+ // -> Fedora: Best we can do without private headers is to hard-code a list of known EXIF tags and read those - if(md_model == TagLib::EXIF_MAIN) { -- const TIFFDirectory *td = &tif->tif_dir; -- -- uint32 lastTag = 0; //<- used to prevent reading some tags twice (as stored in tif_fieldinfo) -- -- for (int fi = 0, nfi = (int)tif->tif_nfields; nfi > 0; nfi--, fi++) { -- const TIFFField *fld = tif->tif_fields[fi]; -- -- const uint32 tag_id = TIFFFieldTag(fld); -- -- if(tag_id == lastTag) { -- continue; -- } -- -- // test if tag value is set -- // (lifted directly from LibTiff _TIFFWriteDirectory) -- -- if( fld->field_bit == FIELD_CUSTOM ) { -- int is_set = FALSE; -- -- for(int ci = 0; ci < td->td_customValueCount; ci++ ) { -- is_set |= (td->td_customValues[ci].info == fld); -- } -- -- if( !is_set ) { -- continue; -- } -- -- } else if(!TIFFFieldSet(tif, fld->field_bit)) { -- continue; -- } -- -- // process *all* other tags (some will be ignored) -- -- tiff_read_exif_tag(tif, tag_id, dib, md_model); -- -- lastTag = tag_id; -+ for (int i = 0; i < nExifTags; ++i) { -+ tiff_read_exif_tag(tif, exif_tag_ids[i], dib, md_model); - } -- - } - - return TRUE; -@@ -723,10 +721,9 @@ tiff_write_exif_tags(TIFF *tif, TagLib:: - - TagLib& tag_lib = TagLib::instance(); - -- for (int fi = 0, nfi = (int)tif->tif_nfields; nfi > 0; nfi--, fi++) { -- const TIFFField *fld = tif->tif_fields[fi]; -- -- const uint32 tag_id = TIFFFieldTag(fld); -+ for (int fi = 0; fi < nExifTags; fi++) { -+ const uint32 tag_id = exif_tag_ids[fi]; -+ const TIFFField *fld = TIFFFieldWithTag(tif, tag_id); - - if(skip_write_field(tif, tag_id)) { - // skip tags that are already handled by the LibTIFF writing process diff --git a/FreeImage_doxygen.patch b/FreeImage_doxygen.patch new file mode 100644 index 0000000..2566625 --- /dev/null +++ b/FreeImage_doxygen.patch @@ -0,0 +1,12 @@ +diff -rupN FreeImage/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox FreeImage-new/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox +--- FreeImage/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox 2015-12-31 23:07:18.000000000 +0100 ++++ FreeImage-new/Wrapper/FreeImagePlus/doc/FreeImagePlus.dox 2018-07-31 23:35:53.584960114 +0200 +@@ -753,7 +753,7 @@ WARN_FORMAT = "$file:$line: $ + # messages should be written. If left blank the output is written to standard + # error (stderr). + +-WARN_LOGFILE = .\doxygen.log ++WARN_LOGFILE = ./doxygen.log + + #--------------------------------------------------------------------------- + # Configuration options related to the input files diff --git a/FreeImage_unbundle.patch b/FreeImage_unbundle.patch new file mode 100644 index 0000000..69d8019 --- /dev/null +++ b/FreeImage_unbundle.patch @@ -0,0 +1,750 @@ +diff -rupN FreeImage/genfipsrclist.sh FreeImage-new/genfipsrclist.sh +--- FreeImage/genfipsrclist.sh 2018-07-28 18:53:18.000000000 +0200 ++++ FreeImage-new/genfipsrclist.sh 2018-07-31 23:37:58.552953202 +0200 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib Wrapper/FreeImagePlus" ++DIRLIST="Wrapper/FreeImagePlus" + + + echo "VER_MAJOR = 3" > fipMakefile.srcs +@@ -19,5 +19,6 @@ echo -n "INCLUDE =" >> fipMakefile.srcs + for DIR in $DIRLIST; do + echo -n " -I$DIR" >> fipMakefile.srcs + done ++echo -n " -IDist" >> fipMakefile.srcs + echo >> fipMakefile.srcs + +diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh +--- FreeImage/gensrclist.sh 2018-07-28 18:52:50.000000000 +0200 ++++ FreeImage-new/gensrclist.sh 2018-07-31 23:37:58.555953202 +0200 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/OpenEXR/IexMath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Source/LibWebP Source/LibJXR Source/LibJXR/common/include Source/LibJXR/image/sys Source/LibJXR/jxrgluelib" ++DIRLIST=". Source Source/Metadata Source/FreeImageToolkit" + + echo "VER_MAJOR = 3" > Makefile.srcs + echo "VER_MINOR = 18.0" >> Makefile.srcs +diff -rupN FreeImage/Makefile.fip FreeImage-new/Makefile.fip +--- FreeImage/Makefile.fip 2015-03-10 08:03:56.000000000 +0100 ++++ FreeImage-new/Makefile.fip 2018-07-31 23:37:58.556953201 +0200 +@@ -17,20 +17,22 @@ MODULES = $(SRCS:.c=.o) + MODULES := $(MODULES:.cpp=.o) + CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden + # OpenJPEG +-CFLAGS += -DOPJ_STATIC ++override CFLAGS += -DOPJ_STATIC + # LibRaw +-CFLAGS += -DNO_LCMS ++override CFLAGS += -DNO_LCMS + # LibJXR +-CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ +-CFLAGS += $(INCLUDE) ++override CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ ++override CFLAGS += $(INCLUDE) + CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy + # LibJXR +-CXXFLAGS += -D__ANSI__ +-CXXFLAGS += $(INCLUDE) ++override CXXFLAGS += -D__ANSI__ ++override CXXFLAGS += $(INCLUDE) ++LDFLAGS ?= ++override LDFLAGS += -LDist -lfreeimage-$(VER_MAJOR).$(VER_MINOR) + + ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) +- CFLAGS += -fPIC +- CXXFLAGS += -fPIC ++ override CFLAGS += -fPIC ++ override CXXFLAGS += -fPIC + endif + + TARGET = freeimageplus +@@ -68,7 +70,7 @@ $(STATICLIB): $(MODULES) + $(AR) r $@ $(MODULES) + + $(SHAREDLIB): $(MODULES) +- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) ++ $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) + + install: + install -d $(INCDIR) $(INSTALLDIR) +diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu +--- FreeImage/Makefile.gnu 2015-03-10 08:04:00.000000000 +0100 ++++ FreeImage-new/Makefile.gnu 2018-07-31 23:37:58.556953201 +0200 +@@ -16,21 +16,11 @@ LIBRARIES = -lstdc++ + MODULES = $(SRCS:.c=.o) + MODULES := $(MODULES:.cpp=.o) + CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden +-# OpenJPEG +-CFLAGS += -DOPJ_STATIC +-# LibRaw +-CFLAGS += -DNO_LCMS +-# LibJXR +-CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__ +-CFLAGS += $(INCLUDE) +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy +-# LibJXR +-CXXFLAGS += -D__ANSI__ +-CXXFLAGS += $(INCLUDE) ++override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib) ++override LDFLAGS += -ljpeg -ljpegxr -ljxrglue $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib) + + ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) +- CFLAGS += -fPIC +- CXXFLAGS += -fPIC ++ override CFLAGS += -fPIC + endif + + TARGET = freeimage +@@ -61,13 +51,13 @@ FreeImage: $(STATICLIB) $(SHAREDLIB) + $(CC) $(CFLAGS) -c $< -o $@ + + .cpp.o: +- $(CXX) $(CXXFLAGS) -c $< -o $@ ++ $(CXX) $(CFLAGS) -c $< -o $@ + + $(STATICLIB): $(MODULES) + $(AR) r $@ $(MODULES) + + $(SHAREDLIB): $(MODULES) +- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) ++ $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) + + install: + install -d $(INCDIR) $(INSTALLDIR) +diff -rupN FreeImage/Source/FreeImage/J2KHelper.cpp FreeImage-new/Source/FreeImage/J2KHelper.cpp +--- FreeImage/Source/FreeImage/J2KHelper.cpp 2015-03-03 23:07:08.000000000 +0100 ++++ FreeImage-new/Source/FreeImage/J2KHelper.cpp 2018-07-31 23:37:58.557953201 +0200 +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include <openjpeg.h> + #include "J2KHelper.h" + + // -------------------------------------------------------------------------- +diff -rupN FreeImage/Source/FreeImage/Plugin.cpp FreeImage-new/Source/FreeImage/Plugin.cpp +--- FreeImage/Source/FreeImage/Plugin.cpp 2017-02-18 14:09:28.000000000 +0100 ++++ FreeImage-new/Source/FreeImage/Plugin.cpp 2018-07-31 23:37:58.558953201 +0200 +@@ -263,7 +263,12 @@ FreeImage_Initialise(BOOL load_local_plu + s_plugins->AddNode(InitDDS); + s_plugins->AddNode(InitGIF); + s_plugins->AddNode(InitHDR); +- s_plugins->AddNode(InitG3); ++/* The G3 fax format plugin is deliberately disabled in the Fedora build of ++ FreeImage as it requires that FreeImage uses a private copy of libtiff ++ which is a no no because of security reasons. */ ++#if 0 ++ s_plugins->AddNode(InitG3); ++#endif + s_plugins->AddNode(InitSGI); + s_plugins->AddNode(InitEXR); + s_plugins->AddNode(InitJ2K); +diff -rupN FreeImage/Source/FreeImage/PluginEXR.cpp FreeImage-new/Source/FreeImage/PluginEXR.cpp +--- FreeImage/Source/FreeImage/PluginEXR.cpp 2015-03-03 23:07:08.000000000 +0100 ++++ FreeImage-new/Source/FreeImage/PluginEXR.cpp 2018-07-31 23:37:58.559953201 +0200 +@@ -28,16 +28,16 @@ + #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning) + #endif + +-#include "../OpenEXR/IlmImf/ImfIO.h" +-#include "../OpenEXR/Iex/Iex.h" +-#include "../OpenEXR/IlmImf/ImfOutputFile.h" +-#include "../OpenEXR/IlmImf/ImfInputFile.h" +-#include "../OpenEXR/IlmImf/ImfRgbaFile.h" +-#include "../OpenEXR/IlmImf/ImfChannelList.h" +-#include "../OpenEXR/IlmImf/ImfRgba.h" +-#include "../OpenEXR/IlmImf/ImfArray.h" +-#include "../OpenEXR/IlmImf/ImfPreviewImage.h" +-#include "../OpenEXR/Half/half.h" ++#include <OpenEXR/ImfIO.h> ++#include <OpenEXR/Iex.h> ++#include <OpenEXR/ImfOutputFile.h> ++#include <OpenEXR/ImfInputFile.h> ++#include <OpenEXR/ImfRgbaFile.h> ++#include <OpenEXR/ImfChannelList.h> ++#include <OpenEXR/ImfRgba.h> ++#include <OpenEXR/ImfArray.h> ++#include <OpenEXR/ImfPreviewImage.h> ++#include <OpenEXR/half.h> + + + // ========================================================== +diff -rupN FreeImage/Source/FreeImage/PluginJ2K.cpp FreeImage-new/Source/FreeImage/PluginJ2K.cpp +--- FreeImage/Source/FreeImage/PluginJ2K.cpp 2015-03-03 23:07:08.000000000 +0100 ++++ FreeImage-new/Source/FreeImage/PluginJ2K.cpp 2018-07-31 23:37:58.559953201 +0200 +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include <openjpeg.h> + #include "J2KHelper.h" + + // ========================================================== +diff -rupN FreeImage/Source/FreeImage/PluginJP2.cpp FreeImage-new/Source/FreeImage/PluginJP2.cpp +--- FreeImage/Source/FreeImage/PluginJP2.cpp 2015-03-03 23:07:08.000000000 +0100 ++++ FreeImage-new/Source/FreeImage/PluginJP2.cpp 2018-07-31 23:37:58.560953201 +0200 +@@ -21,7 +21,7 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibOpenJPEG/openjpeg.h" ++#include <openjpeg.h> + #include "J2KHelper.h" + + // ========================================================== +diff -rupN FreeImage/Source/FreeImage/PluginJPEG.cpp FreeImage-new/Source/FreeImage/PluginJPEG.cpp +--- FreeImage/Source/FreeImage/PluginJPEG.cpp 2018-07-28 19:22:22.000000000 +0200 ++++ FreeImage-new/Source/FreeImage/PluginJPEG.cpp 2018-07-31 23:37:58.561953201 +0200 +@@ -35,9 +35,9 @@ extern "C" { + #undef FAR + #include <setjmp.h> + +-#include "../LibJPEG/jinclude.h" +-#include "../LibJPEG/jpeglib.h" +-#include "../LibJPEG/jerror.h" ++#include <stdio.h> ++#include <jpeglib.h> ++#include <jerror.h> + } + + #include "FreeImage.h" +@@ -485,116 +485,6 @@ marker_is_icc(jpeg_saved_marker_ptr mark + } + + /** +- See if there was an ICC profile in the JPEG file being read; +- if so, reassemble and return the profile data. +- +- TRUE is returned if an ICC profile was found, FALSE if not. +- If TRUE is returned, *icc_data_ptr is set to point to the +- returned data, and *icc_data_len is set to its length. +- +- IMPORTANT: the data at **icc_data_ptr has been allocated with malloc() +- and must be freed by the caller with free() when the caller no longer +- needs it. (Alternatively, we could write this routine to use the +- IJG library's memory allocator, so that the data would be freed implicitly +- at jpeg_finish_decompress() time. But it seems likely that many apps +- will prefer to have the data stick around after decompression finishes.) +- +- NOTE: if the file contains invalid ICC APP2 markers, we just silently +- return FALSE. You might want to issue an error message instead. +-*/ +-static BOOL +-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) { +- jpeg_saved_marker_ptr marker; +- int num_markers = 0; +- int seq_no; +- JOCTET *icc_data; +- unsigned total_length; +- +- const int MAX_SEQ_NO = 255; // sufficient since marker numbers are bytes +- BYTE marker_present[MAX_SEQ_NO+1]; // 1 if marker found +- unsigned data_length[MAX_SEQ_NO+1]; // size of profile data in marker +- unsigned data_offset[MAX_SEQ_NO+1]; // offset for data in marker +- +- *icc_data_ptr = NULL; // avoid confusion if FALSE return +- *icc_data_len = 0; +- +- /** +- this first pass over the saved markers discovers whether there are +- any ICC markers and verifies the consistency of the marker numbering. +- */ +- +- memset(marker_present, 0, (MAX_SEQ_NO + 1)); +- +- for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) { +- if (marker_is_icc(marker)) { +- if (num_markers == 0) { +- // number of markers +- num_markers = GETJOCTET(marker->data[13]); +- } +- else if (num_markers != GETJOCTET(marker->data[13])) { +- return FALSE; // inconsistent num_markers fields +- } +- // sequence number +- seq_no = GETJOCTET(marker->data[12]); +- if (seq_no <= 0 || seq_no > num_markers) { +- return FALSE; // bogus sequence number +- } +- if (marker_present[seq_no]) { +- return FALSE; // duplicate sequence numbers +- } +- marker_present[seq_no] = 1; +- data_length[seq_no] = marker->data_length - ICC_HEADER_SIZE; +- } +- } +- +- if (num_markers == 0) +- return FALSE; +- +- /** +- check for missing markers, count total space needed, +- compute offset of each marker's part of the data. +- */ +- +- total_length = 0; +- for(seq_no = 1; seq_no <= num_markers; seq_no++) { +- if (marker_present[seq_no] == 0) { +- return FALSE; // missing sequence number +- } +- data_offset[seq_no] = total_length; +- total_length += data_length[seq_no]; +- } +- +- if (total_length <= 0) +- return FALSE; // found only empty markers ? +- +- // allocate space for assembled data +- icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET)); +- if (icc_data == NULL) +- return FALSE; // out of memory +- +- // and fill it in +- for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) { +- if (marker_is_icc(marker)) { +- JOCTET FAR *src_ptr; +- JOCTET *dst_ptr; +- unsigned length; +- seq_no = GETJOCTET(marker->data[12]); +- dst_ptr = icc_data + data_offset[seq_no]; +- src_ptr = marker->data + ICC_HEADER_SIZE; +- length = data_length[seq_no]; +- while (length--) { +- *dst_ptr++ = *src_ptr++; +- } +- } +- } +- +- *icc_data_ptr = icc_data; +- *icc_data_len = total_length; +- +- return TRUE; +-} +- +-/** + Read JPEG_APPD marker (IPTC or Adobe Photoshop profile) + */ + static BOOL +diff -rupN FreeImage/Source/FreeImage/PluginJXR.cpp FreeImage-new/Source/FreeImage/PluginJXR.cpp +--- FreeImage/Source/FreeImage/PluginJXR.cpp 2015-03-03 23:07:08.000000000 +0100 ++++ FreeImage-new/Source/FreeImage/PluginJXR.cpp 2018-07-31 23:37:58.561953201 +0200 +@@ -23,7 +23,7 @@ + #include "Utilities.h" + #include "../Metadata/FreeImageTag.h" + +-#include "../LibJXR/jxrgluelib/JXRGlue.h" ++#include <JXRGlue.h> + + // ========================================================== + // Plugin Interface +diff -rupN FreeImage/Source/FreeImage/PluginPNG.cpp FreeImage-new/Source/FreeImage/PluginPNG.cpp +--- FreeImage/Source/FreeImage/PluginPNG.cpp 2018-07-28 20:15:24.000000000 +0200 ++++ FreeImage-new/Source/FreeImage/PluginPNG.cpp 2018-07-31 23:37:58.561953201 +0200 +@@ -40,8 +40,8 @@ + + // ---------------------------------------------------------- + +-#include "../ZLib/zlib.h" +-#include "../LibPNG/png.h" ++#include <zlib.h> ++#include <png.h> + + // ---------------------------------------------------------- + +diff -rupN FreeImage/Source/FreeImage/PluginRAW.cpp FreeImage-new/Source/FreeImage/PluginRAW.cpp +--- FreeImage/Source/FreeImage/PluginRAW.cpp 2015-03-10 10:12:04.000000000 +0100 ++++ FreeImage-new/Source/FreeImage/PluginRAW.cpp 2018-07-31 23:37:58.561953201 +0200 +@@ -19,7 +19,7 @@ + // Use at your own risk! + // ========================================================== + +-#include "../LibRawLite/libraw/libraw.h" ++#include <libraw/libraw.h> + + #include "FreeImage.h" + #include "Utilities.h" +diff -rupN FreeImage/Source/FreeImage/PluginTIFF.cpp FreeImage-new/Source/FreeImage/PluginTIFF.cpp +--- FreeImage/Source/FreeImage/PluginTIFF.cpp 2018-07-29 00:24:43.000000000 +0200 ++++ FreeImage-new/Source/FreeImage/PluginTIFF.cpp 2018-07-31 23:52:38.774904514 +0200 +@@ -37,9 +37,9 @@ + + #include "FreeImage.h" + #include "Utilities.h" +-#include "../LibTIFF4/tiffiop.h" ++#include <tiffio.h> + #include "../Metadata/FreeImageTag.h" +-#include "../OpenEXR/Half/half.h" ++#include <OpenEXR/half.h> + + #include "FreeImageIO.h" + #include "PSDParser.h" +@@ -193,17 +193,6 @@ TIFFFdOpen(thandle_t handle, const char + + return tif; + } +- +-/** +-Open a TIFF file for reading or writing +-@param name +-@param mode +-*/ +-TIFF* +-TIFFOpen(const char* name, const char* mode) { +- return 0; +-} +- + // ---------------------------------------------------------- + // TIFF library FreeImage-specific routines. + // ---------------------------------------------------------- +diff -rupN FreeImage/Source/FreeImage/PluginWebP.cpp FreeImage-new/Source/FreeImage/PluginWebP.cpp +--- FreeImage/Source/FreeImage/PluginWebP.cpp 2016-06-15 15:48:12.000000000 +0200 ++++ FreeImage-new/Source/FreeImage/PluginWebP.cpp 2018-07-31 23:38:40.531950880 +0200 +@@ -24,9 +24,9 @@ + + #include "../Metadata/FreeImageTag.h" + +-#include "../LibWebP/src/webp/decode.h" +-#include "../LibWebP/src/webp/encode.h" +-#include "../LibWebP/src/webp/mux.h" ++#include <webp/decode.h> ++#include <webp/encode.h> ++#include <webp/mux.h> + + // ========================================================== + // Plugin Interface +diff -rupN FreeImage/Source/FreeImage/PSDParser.cpp FreeImage-new/Source/FreeImage/PSDParser.cpp +--- FreeImage/Source/FreeImage/PSDParser.cpp 2016-02-11 03:18:02.000000000 +0100 ++++ FreeImage-new/Source/FreeImage/PSDParser.cpp 2018-08-01 00:17:18.323822675 +0200 +@@ -133,8 +133,8 @@ public: + template <> + class PSDGetValue<8> { + public: +- static inline UINT64 get(const BYTE * iprBuffer) { +- UINT64 v = ((const UINT64*)iprBuffer)[0]; ++ static inline uint64_t get(const BYTE * iprBuffer) { ++ uint64_t v = ((const uint64_t*)iprBuffer)[0]; + #ifndef FREEIMAGE_BIGENDIAN + SwapInt64(&v); + #endif +@@ -147,7 +147,7 @@ public: + + // -------------------------------------------------------------------------- + +-static UINT64 ++static uint64_t + psdReadSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header) { + if(header._Version == 1) { + BYTE Length[4]; +@@ -199,11 +199,11 @@ public: + template <> + class PSDSetValue<8> { + public: +- static inline void set(const BYTE * iprBuffer, UINT64 v) { ++ static inline void set(const BYTE * iprBuffer, uint64_t v) { + #ifndef FREEIMAGE_BIGENDIAN + SwapInt64(&v); + #endif +- ((UINT64*)iprBuffer)[0] = v; ++ ((uint64_t*)iprBuffer)[0] = v; + } + }; + +@@ -213,7 +213,7 @@ public: + // -------------------------------------------------------------------------- + + static inline bool +-psdWriteSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header, UINT64 v) { ++psdWriteSize(FreeImageIO *io, fi_handle handle, const psdHeaderInfo& header, uint64_t v) { + if(header._Version == 1) { + BYTE Length[4]; + psdSetLongValue(Length, sizeof(Length), (DWORD)v); +@@ -1063,10 +1063,10 @@ unsigned psdParser::GetChannelOffset(FIB + bool psdParser::ReadLayerAndMaskInfoSection(FreeImageIO *io, fi_handle handle) { + bool bSuccess = true; + +- UINT64 nTotalBytes = psdReadSize(io, handle, _headerInfo); ++ uint64_t nTotalBytes = psdReadSize(io, handle, _headerInfo); + + // Hack to handle large PSB files without using fseeko(). +- if (sizeof(long) < sizeof(UINT64)) { ++ if (sizeof(long) < sizeof(uint64_t)) { + const long offset = 0x10000000; + while (nTotalBytes > offset) { + if (io->seek_proc(handle, offset, SEEK_CUR) != 0) { +@@ -1672,7 +1672,7 @@ bool psdParser::WriteLayerAndMaskInfoSec + // Short section with no layers. + BYTE IntValue[4]; + +- UINT64 size; ++ uint64_t size; + if(_headerInfo._Version == 1) { + size = 8; + } else { +diff -rupN FreeImage/Source/FreeImage/ZLibInterface.cpp FreeImage-new/Source/FreeImage/ZLibInterface.cpp +--- FreeImage/Source/FreeImage/ZLibInterface.cpp 2015-03-03 23:07:10.000000000 +0100 ++++ FreeImage-new/Source/FreeImage/ZLibInterface.cpp 2018-07-31 23:37:58.563953201 +0200 +@@ -19,10 +19,9 @@ + // Use at your own risk! + // ========================================================== + +-#include "../ZLib/zlib.h" ++#include <zlib.h> + #include "FreeImage.h" + #include "Utilities.h" +-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */ + + /** + Compresses a source buffer into a target buffer, using the ZLib library. +@@ -115,7 +114,7 @@ FreeImage_ZLibGZip(BYTE *target, DWORD t + return 0; + case Z_OK: { + // patch header, setup crc and length (stolen from mod_trace_output) +- BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code ++ BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code (unix) + crc = crc32(crc, source, source_size); + memcpy(target + 4 + dest_len, &crc, 4); + memcpy(target + 8 + dest_len, &source_size, 4); +diff -rupN FreeImage/Source/FreeImage.h FreeImage-new/Source/FreeImage.h +--- FreeImage/Source/FreeImage.h 2018-03-25 18:42:20.000000000 +0200 ++++ FreeImage-new/Source/FreeImage.h 2018-08-01 00:16:34.704825088 +0200 +@@ -155,8 +155,11 @@ typedef uint8_t BYTE; + typedef uint16_t WORD; + typedef uint32_t DWORD; + typedef int32_t LONG; ++// Disable these, they conflict with the (wrong) ones of libraw ++#if 0 + typedef int64_t INT64; + typedef uint64_t UINT64; ++#endif + #else + // MS is not C99 ISO compliant + typedef long BOOL; +@@ -410,7 +413,12 @@ FI_ENUM(FREE_IMAGE_FORMAT) { + FIF_DDS = 24, + FIF_GIF = 25, + FIF_HDR = 26, +- FIF_FAXG3 = 27, ++/* The G3 fax format plugin is deliberately disabled in the Fedora build of ++ FreeImage as it requires that FreeImage uses a private copy of libtiff ++ which is a no no because of security reasons. */ ++#if 0 ++ FIF_FAXG3 = 27, ++#endif + FIF_SGI = 28, + FIF_EXR = 29, + FIF_J2K = 30, +@@ -473,6 +481,10 @@ FI_ENUM(FREE_IMAGE_DITHER) { + FID_BAYER16x16 = 6 //! Bayer ordered dispersed dot dithering (order 4 dithering matrix) + }; + ++/* The FreeImage_JPEGTransform functions are deliberately disabled in the ++ Fedora build of FreeImage as they require that FreeImage uses a private copy ++ of libjpeg which is a no no because of security reasons. */ ++#if 0 + /** Lossless JPEG transformations + Constants used in FreeImage_JPEGTransform + */ +@@ -486,6 +498,7 @@ FI_ENUM(FREE_IMAGE_JPEG_OPERATION) { + FIJPEG_OP_ROTATE_180 = 6, //! 180-degree rotation + FIJPEG_OP_ROTATE_270 = 7 //! 270-degree clockwise (or 90 ccw) + }; ++#endif + + /** Tone mapping operators. + Constants used in FreeImage_ToneMapping. +@@ -1088,7 +1101,10 @@ DLL_API const char* DLL_CALLCONV FreeIma + // -------------------------------------------------------------------------- + // JPEG lossless transformation routines + // -------------------------------------------------------------------------- +- ++/* The FreeImage_JPEGTransform functions are deliberately disabled in the +++ Fedora build of FreeImage as they require that FreeImage uses a private copy +++ of libjpeg which is a no no because of security reasons. */ ++#if 0 + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE)); + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE)); + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom); +@@ -1097,6 +1113,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEG + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); + DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE)); ++#endif + + + // -------------------------------------------------------------------------- +diff -rupN FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp FreeImage-new/Source/FreeImageToolkit/JPEGTransform.cpp +--- FreeImage/Source/FreeImageToolkit/JPEGTransform.cpp 2015-03-03 23:07:10.000000000 +0100 ++++ FreeImage-new/Source/FreeImageToolkit/JPEGTransform.cpp 2018-07-31 23:37:58.563953201 +0200 +@@ -26,10 +26,10 @@ extern "C" { + #undef FAR + #include <setjmp.h> + +-#include "../LibJPEG/jinclude.h" +-#include "../LibJPEG/jpeglib.h" +-#include "../LibJPEG/jerror.h" +-#include "../LibJPEG/transupp.h" ++#include <jinclude.h> ++#include <jpeglib.h> ++#include <jerror.h> ++#include <transupp.h> + } + + #include "FreeImage.h" +diff -rupN FreeImage/Source/Metadata/TagConversion.cpp FreeImage-new/Source/Metadata/TagConversion.cpp +--- FreeImage/Source/Metadata/TagConversion.cpp 2018-03-25 12:30:54.000000000 +0200 ++++ FreeImage-new/Source/Metadata/TagConversion.cpp 2018-07-31 23:37:58.564953201 +0200 +@@ -30,6 +30,11 @@ + + #define MAX_TEXT_EXTENT 512 + ++// These were in FreeImage.h, but are moved here to avoid conflicts (see note in FreeImage.h) ++typedef int64_t INT64; ++typedef uint64_t UINT64; ++ ++ + /** + Convert a tag to a C string + */ +diff -rupN FreeImage/Source/Metadata/XTIFF.cpp FreeImage-new/Source/Metadata/XTIFF.cpp +--- FreeImage/Source/Metadata/XTIFF.cpp 2015-03-03 23:07:10.000000000 +0100 ++++ FreeImage-new/Source/Metadata/XTIFF.cpp 2018-07-31 23:37:58.564953201 +0200 +@@ -29,13 +29,18 @@ + #pragma warning (disable : 4786) // identifier was truncated to 'number' characters + #endif + +-#include "../LibTIFF4/tiffiop.h" ++#include <tiffio.h> + + #include "FreeImage.h" + #include "Utilities.h" + #include "FreeImageTag.h" + #include "FIRational.h" + ++extern "C" ++{ ++ int _TIFFDataSize(TIFFDataType type); ++} ++ + // ---------------------------------------------------------- + // Extended TIFF Directory GEO Tag Support + // ---------------------------------------------------------- +@@ -224,6 +229,33 @@ tiff_write_geotiff_profile(TIFF *tif, FI + // TIFF EXIF tag reading & writing + // ---------------------------------------------------------- + ++static uint32 exif_tag_ids[] = { ++ EXIFTAG_EXPOSURETIME, EXIFTAG_FNUMBER, EXIFTAG_EXPOSUREPROGRAM, ++ EXIFTAG_SPECTRALSENSITIVITY, EXIFTAG_ISOSPEEDRATINGS, EXIFTAG_OECF, ++ EXIFTAG_EXIFVERSION, EXIFTAG_DATETIMEORIGINAL, EXIFTAG_DATETIMEDIGITIZED, ++ EXIFTAG_COMPONENTSCONFIGURATION, EXIFTAG_COMPRESSEDBITSPERPIXEL, ++ EXIFTAG_SHUTTERSPEEDVALUE, EXIFTAG_APERTUREVALUE, ++ EXIFTAG_BRIGHTNESSVALUE, EXIFTAG_EXPOSUREBIASVALUE, ++ EXIFTAG_MAXAPERTUREVALUE, EXIFTAG_SUBJECTDISTANCE, EXIFTAG_METERINGMODE, ++ EXIFTAG_LIGHTSOURCE, EXIFTAG_FLASH, EXIFTAG_FOCALLENGTH, ++ EXIFTAG_SUBJECTAREA, EXIFTAG_MAKERNOTE, EXIFTAG_USERCOMMENT, ++ EXIFTAG_SUBSECTIME, EXIFTAG_SUBSECTIMEORIGINAL, ++ EXIFTAG_SUBSECTIMEDIGITIZED, EXIFTAG_FLASHPIXVERSION, EXIFTAG_COLORSPACE, ++ EXIFTAG_PIXELXDIMENSION, EXIFTAG_PIXELYDIMENSION, ++ EXIFTAG_RELATEDSOUNDFILE, EXIFTAG_FLASHENERGY, ++ EXIFTAG_SPATIALFREQUENCYRESPONSE, EXIFTAG_FOCALPLANEXRESOLUTION, ++ EXIFTAG_FOCALPLANEYRESOLUTION, EXIFTAG_FOCALPLANERESOLUTIONUNIT, ++ EXIFTAG_SUBJECTLOCATION, EXIFTAG_EXPOSUREINDEX, EXIFTAG_SENSINGMETHOD, ++ EXIFTAG_FILESOURCE, EXIFTAG_SCENETYPE, EXIFTAG_CFAPATTERN, ++ EXIFTAG_CUSTOMRENDERED, EXIFTAG_EXPOSUREMODE, EXIFTAG_WHITEBALANCE, ++ EXIFTAG_DIGITALZOOMRATIO, EXIFTAG_FOCALLENGTHIN35MMFILM, ++ EXIFTAG_SCENECAPTURETYPE, EXIFTAG_GAINCONTROL, EXIFTAG_CONTRAST, ++ EXIFTAG_SATURATION, EXIFTAG_SHARPNESS, EXIFTAG_DEVICESETTINGDESCRIPTION, ++ EXIFTAG_SUBJECTDISTANCERANGE, EXIFTAG_GAINCONTROL, EXIFTAG_GAINCONTROL, ++ EXIFTAG_IMAGEUNIQUEID ++}; ++static int nExifTags = sizeof(exif_tag_ids) / sizeof(exif_tag_ids[0]); ++ + /** + Read a single Exif tag + +@@ -575,45 +607,11 @@ tiff_read_exif_tags(TIFF *tif, TagLib::M + + // loop over all Core Directory Tags + // ### uses private data, but there is no other way ++ // -> Fedora: Best we can do without private headers is to hard-code a list of known EXIF tags and read those + if(md_model == TagLib::EXIF_MAIN) { +- const TIFFDirectory *td = &tif->tif_dir; +- +- uint32 lastTag = 0; //<- used to prevent reading some tags twice (as stored in tif_fieldinfo) +- +- for (int fi = 0, nfi = (int)tif->tif_nfields; nfi > 0; nfi--, fi++) { +- const TIFFField *fld = tif->tif_fields[fi]; +- +- const uint32 tag_id = TIFFFieldTag(fld); +- +- if(tag_id == lastTag) { +- continue; +- } +- +- // test if tag value is set +- // (lifted directly from LibTiff _TIFFWriteDirectory) +- +- if( fld->field_bit == FIELD_CUSTOM ) { +- int is_set = FALSE; +- +- for(int ci = 0; ci < td->td_customValueCount; ci++ ) { +- is_set |= (td->td_customValues[ci].info == fld); +- } +- +- if( !is_set ) { +- continue; +- } +- +- } else if(!TIFFFieldSet(tif, fld->field_bit)) { +- continue; +- } +- +- // process *all* other tags (some will be ignored) +- +- tiff_read_exif_tag(tif, tag_id, dib, md_model); +- +- lastTag = tag_id; ++ for (int i = 0; i < nExifTags; ++i) { ++ tiff_read_exif_tag(tif, exif_tag_ids[i], dib, md_model); + } +- + } + + return TRUE; +@@ -723,10 +721,9 @@ tiff_write_exif_tags(TIFF *tif, TagLib:: + + TagLib& tag_lib = TagLib::instance(); + +- for (int fi = 0, nfi = (int)tif->tif_nfields; nfi > 0; nfi--, fi++) { +- const TIFFField *fld = tif->tif_fields[fi]; +- +- const uint32 tag_id = TIFFFieldTag(fld); ++ for (int fi = 0; fi < nExifTags; fi++) { ++ const uint32 tag_id = exif_tag_ids[fi]; ++ const TIFFField *fld = TIFFFieldWithTag(tif, tag_id); + + if(skip_write_field(tif, tag_id)) { + // skip tags that are already handled by the LibTIFF writing process +diff -rupN FreeImage/Source/Utilities.h FreeImage-new/Source/Utilities.h +--- FreeImage/Source/Utilities.h 2016-04-11 15:15:32.000000000 +0200 ++++ FreeImage-new/Source/Utilities.h 2018-08-01 00:16:29.826825358 +0200 +@@ -446,12 +446,12 @@ SwapLong(DWORD *lp) { + } + + inline void +-SwapInt64(UINT64 *arg) { ++SwapInt64(uint64_t *arg) { + #if defined(_MSC_VER) && _MSC_VER >= 1310 + *arg = _byteswap_uint64(*arg); + #else + union Swap { +- UINT64 sv; ++ uint64_t sv; + DWORD ul[2]; + } tmp, result; + tmp.sv = *arg; diff --git a/freeimage.spec b/freeimage.spec index ba89f27..7b69f0c 100644 --- a/freeimage.spec +++ b/freeimage.spec @@ -1,9 +1,8 @@ -%define _version 3170 %define major 3 Name: freeimage -Version: 3.17.0 -Release: 16%{?dist} +Version: 3.18.0 +Release: 1%{?dist} Summary: Multi-format image decoder library # freeimage is tripple-licensed, see @@ -11,15 +10,11 @@ Summary: Multi-format image decoder library # https://lists.fedoraproject.org/pipermail/legal/2013-October/002271.html License: GPLv2 or GPLv3 or MPLv1.0 URL: http://freeimage.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/FreeImage%{_version}.zip +Source0: http://downloads.sourceforge.net/%{name}/FreeImage%(echo %{version} | sed 's|\.||g').zip # Unbundle bundled libraries -Patch0: FreeImage-3.17.0_unbundle.patch -# Fix incorrect paths in doxyfile -Patch1: FreeImage-3.17.0_doxygen.patch -# Fix CVE-2015-0852 (#1257859) -Patch2: FreeImage-3.17.0_CVE-2015-0852.patch -# Fix CVE-2016-5684 (#1381517) -Patch3: FreeImage-3.17.0_CVE-2016-5684.patch +Patch0: FreeImage_unbundle.patch +# Fix incorrect path in doxyfile +Patch1: FreeImage_doxygen.patch BuildRequires: doxygen BuildRequires: gcc-c++ @@ -67,11 +62,7 @@ developing applications that use %{name}-plus. %prep -%setup -q -n FreeImage -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -n FreeImage # remove all included libs to make sure these don't get used during compile rm -r Source/Lib* Source/ZLib Source/OpenEXR @@ -145,12 +136,15 @@ ldconfig -n %{buildroot}%{_libdir} %{_libdir}/lib%{name}plus.so.%major %files plus-devel -%doc Wrapper/FreeImagePlus/doc/html +%doc Wrapper/FreeImagePlus/html %{_includedir}/FreeImagePlus.h %{_libdir}/lib%{name}plus.so %changelog +* Tue Jul 31 2018 Sandro Mani <manisandro(a)gmail.com> - 3.18.0-1 +- Update to 3.18.0 + * Thu Jul 19 2018 Adam Williamson <awilliam(a)redhat.com> - 3.17.0-16 - Rebuild for new libraw - fPIC for aarch64 also diff --git a/sources b/sources index 393529b..e3d8be4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -459e15f0ec75d6efa3c7bd63277ead86 FreeImage3170.zip +SHA512 (FreeImage3180.zip) = 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818 https://src.fedoraproject.org/rpms/freeimage/c/fc41dd11c6506ce4b5372a61c7ac…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits July 2018