26 Commits
Author SHA1 Message Date
Xisco Fauli 239f0ec982 libtiff: drop obsolete patch
it has been fixed upstream

Change-Id: I7a23ae5271653db026c479a7f3771ca06e2f4425
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207669
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
2026-07-07 12:12:22 +02:00
Xisco Fauli fb7b3065be libtiff: upgrade to 4.7.2
0001-TIFFReadRGBAImage-prevent-integer-overflow-and-later.patch
has been fixed upstream

Downloaded from https://download.osgeo.org/libtiff/tiff-4.7.2.tar.xz

Change-Id: I4478bb99ad7935815649054868ecf90b306dc1b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207612
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2026-07-04 18:23:24 +02:00
Michael Stahl bf7bd37d1c libtiff: add patch for CVE-2026-4775
Signed-off-by: Michael Stahl <michael.stahl@collabora.com>
Change-Id: I3554b8f27176ebc837029cf07e0dca0a24595459
Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/1601
Tested-by: Jenkins CPCI <releng@collaboraoffice.com>
Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com>
(cherry picked from commit 3ca37a2c4a3ecd7b4e2c4731af91776813f72093)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204408
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2026-04-27 12:40:43 +02:00
Xisco Fauli 3709789a58 gbuild: set default patchlevel to 1
Change-Id: I195dbafff63e21a22edf438f5b9ed5beee4dac03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183784
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2025-04-08 09:24:08 +02:00
Xisco Fauli c9057566e3 libjpeg-turbo: upgrade to 3.1.0
Downloaded from https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.1.0/libjpeg-turbo-3.1.0.tar.gz

Change-Id: Ic9e8c7e4520073da09abf27866aa3cff0b6a0c63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183617
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2025-04-03 14:11:41 +02:00
Michael Stahl d838b0d4af libtiff: upgrade to release 4.7.0
Fixes CVE-2023-52356 CVE-2024-7006

ofz65182.patch was apparently merged upstream and then reverted;
Caolán suggested to drop the patch and see if ofz still finds a problem
there.

Change-Id: I0967708f19a7151b020372eca3c906b30f693db9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173602
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2024-09-19 09:43:17 +02:00
Caolán McNamara 034b68eb3a ofz#68840 another putcontig8bitYCbCr22tile issue
Change-Id: I6e119cf1b3bec609f94784eb0c439835875d6112
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168031
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2024-05-25 21:04:17 +02:00
Christian Lohmaier 875a1bf2e1 makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo)
…by a simple/static $(gb_UnpackedTarball_workdir)/foo
see also 0c4c84a14b

Change-Id: I8e6aa55c85534c4446556548910c950ddbe7c6fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
2024-05-06 11:40:45 +02:00
Caolán McNamara f78a9d7d86 ofz#65182 putcontig8bitYCbCr22tile issue
Change-Id: I0242059b17d07c0ab4ec83aabd073ee31c4631d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161031
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-12-20 09:31:22 +01:00
Caolán McNamara 4273ebd28b upgrade libtiff to 4.6.0
Change-Id: I839f78e5431caac378ce936aa5e34357144ae6b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158593
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-10-28 21:57:28 +02:00
Caolán McNamara e60ef8651c ofz: Use-of-uninitialized-value
same as seen at: https://gitlab.com/libtiff/libtiff/-/issues/582

Change-Id: Ifc4eaaa47ad392968db814783281f1db76564d9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155874
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-08-20 22:48:13 +02:00
Caolán McNamara 72b118e4cb set libtiff ac_cv_lib_jpeg_jpeg12_read_scanlines cache val to false
to avoid:

...
checking for jpeg12_read_scanlines in -ljpeg... yes
...
JPEG 8/12 bit dual mode:            yes (libjpeg turbo >= 2.2 dual mode)
...
tif_jpeg.c:143:25: error: unknown type name ‘J12SAMPARRAY’
  143 | #define TIFF_JSAMPARRAY J12SAMPARRAY

where the system jpeg is linked against during configure but the build
is against the internal jpeg and the system one happens to support
jpeg12_read_scanlines

Change-Id: I895d77c59a5bef1af0b1a85d44da1a54e502f8e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155670
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-08-15 11:51:45 +02:00
Caolán McNamara 20b64cf151 ofz#54685 Timeout
Change-Id: I2f71f61c371055521c884a00dde48a811d204df1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145875
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-20 12:32:14 +00:00
Caolán McNamara 8bdb85f8c7 upgrade to libtiff 4.5.0
Change-Id: Ic54ecba50862860a67f92a2fc6e45fd275fa9a31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144155
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-12-14 12:37:55 +00:00
Stephan Bergmann 12ffb0cb65 external/libtiff: Missing include for _byteswap_uint64 on Windows
...now causing a -Wimplicit-function-declaration error with Clang 15 trunk after
<https://github.com/llvm/llvm-project/commit/7d644e1215b376ec5e915df9ea2eeb56e2d94626>
"[C11/C2x] Change the behavior of the implicit function declaration warning".

(Unconditionally including <stdlib.h> on all platforms even for those that don't
need it should be harmless.)

Change-Id: Ic2191308ea252cb4b88842a2767167ab2d23d9fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135572
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-06-10 09:46:49 +02:00
Caolán McNamara 88fbab0186 ofz#47901 fix read overflow
Change-Id: I707fe54e68ef548edcb8b69b83ba64c0674e44ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135532
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-06-09 13:48:12 +02:00
Jan-Marek Glogowski 98cfc7db5e libtiff WASM: add Emscripten flags to fix NEH build
Change-Id: I3ea1ca064cdddee1bea6b5816f63f0e4a93217de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135505
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2022-06-08 18:53:32 +02:00
Caolán McNamara 4c3b44fd1e upgrade libtiff to 4.4.0
dropping ubsan.patch which was fixed upstream in this release

Change-Id: Ic2e35b24f7a9c7c3e2a00da8bc5b5b7d500746fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135359
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-06-03 18:03:12 +02:00
Caolán McNamara 4bd3b725cb We actually want to divide by 257 here
follow the * 257 suggestion at
https://gitlab.com/libtiff/libtiff/-/merge_requests/336

I did think it looked a tiny bit different than the others

Change-Id: I92306ae22d2acc485a4162160a8c0464a32591d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134844
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-24 09:54:36 +02:00
Stephan Bergmann 91f408fd94 external/libtiff: Silence invalid-null-argument
...during CppunitTest_vcl_filters_test,

> tif_dirread.c:4176:40: runtime error: null pointer passed as argument 2, which is declared to never be null
> /usr/include/string.h:44:28: note: nonnull attribute specified here
>  #0 in TIFFReadDirectory at workdir/UnpackedTarball/libtiff/libtiff/tif_dirread.c:4176:17 (instdir/program/libvcllo.so +0xc4dbb6d)
>  #1 in ImportTiffGraphicImport(SvStream&, Graphic&) at vcl/source/filter/itiff/itiff.cxx:238:14 (instdir/program/libvcllo.so +0xa691680)
>  #2 in TiffFilterTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) at vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx:70:12 (workdir/LinkTarget/CppunitTest/libtest_vcl_filters_test.so +0x16dc48)
>  #3 in test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at unotest/source/cpp/filters-test.cxx:132:20 (workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0xd8d5c)
>  #4 in test::FiltersTest::testDir(rtl::OUString const&, std::basic_string_view<char16_t, std::char_traits<char16_t>>, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) at unotest/source/cpp/filters-test.cxx:160:5 (workdir/LinkTarget/CppunitTest/../Library/libunotest.so +0xdcc71)
>  #5 in TiffFilterTest::testCVEs() at vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx:76:5 (workdir/LinkTarget/CppunitTest/libtest_vcl_filters_test.so +0x16e1c5)

Change-Id: I2de4363ff0f5552e89fd0af84b7b88e38b7bb209
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134823
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-05-23 21:59:21 +02:00
Julien Nabet a14d8acb93 README libtiff
Change-Id: Icece0daad46896334cba7dc66435351a347bd2cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134819
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-23 18:16:43 +02:00
Caolán McNamara 5b74eb7d41 tdf#131199 add some basic 16bitcielab support
to get that final tiff loadable

Change-Id: Ia772c06521c93ac860e9d3014706d677f16c8d4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134734
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-22 21:30:20 +02:00
Caolán McNamara 11e4235930 tiff: enable webp
Change-Id: Ifd277fd89393f964817bf58dead53074321252d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134711
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-21 20:06:24 +02:00
Caolán McNamara 685eff8c9e libtiff: enable jpeg and zlib
Change-Id: Ied6ab75342f5cdaadefbff7f75fbe63e9d67e992
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134667
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-21 17:25:46 +02:00
Caolán McNamara f948108d85 explicitly disable some things that might otherwise get enabled
depending on what happens to be installed on the build system

Change-Id: Ic0c3eed721aeba6361aa6da82b467891d24d7557
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134709
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-21 17:03:20 +02:00
Julien Nabet a2ffd71f20 build libtiff
Change-Id: Id9b6e1355147c3f68b9922db14f1b4904a05c686
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134650
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-20 22:29:00 +02:00