external/libtiff/UnpackedTarball_libtiff.mk | 1 +
external/libtiff/ofz68840.patch | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
New commits:
commit 034b68eb3a015553254c7238b13db8f94514080d
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri May 24 20:43:42 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat May 25 21:04:17 2024 +0200
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.mcnam...@collabora.com>
diff --git a/external/libtiff/UnpackedTarball_libtiff.mk
b/external/libtiff/UnpackedTarball_libtiff.mk
index 7f27c8d3fee7..dbd4c2c54d7c 100644
--- a/external/libtiff/UnpackedTarball_libtiff.mk
+++ b/external/libtiff/UnpackedTarball_libtiff.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libtiff,\
external/libtiff/libtiff.linknolibs.patch \
external/libtiff/0001-ofz-54685-Timeout.patch \
external/libtiff/ofz65182.patch \
+ external/libtiff/ofz68840.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libtiff/ofz68840.patch b/external/libtiff/ofz68840.patch
new file mode 100644
index 000000000000..0a8721ebe012
--- /dev/null
+++ b/external/libtiff/ofz68840.patch
@@ -0,0 +1,17 @@
+--- a/libtiff/tif_tile.c
++++ b/libtiff/tif_tile.c
+@@ -233,7 +233,13 @@
+ _TIFFMultiply64(tif, samplingrow_size, samplingblocks_ver,
module));
+ }
+ else
+- return (_TIFFMultiply64(tif, nrows, TIFFTileRowSize64(tif), module));
++ {
++ uint64_t row_size = TIFFTileRowSize64(tif);
++ /* I think the way this works the expectation is there are always
even num of samples */
++ if (td->td_photometric == PHOTOMETRIC_YCBCR)
++ row_size = TIFFroundup_64(row_size, 2);
++ return (_TIFFMultiply64(tif, nrows, row_size, module));
++ }
+ }
+ tmsize_t TIFFVTileSize(TIFF *tif, uint32_t nrows)
+ {
