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
This commit is contained in:
Xisco Fauli
2026-07-07 12:12:22 +02:00
parent 304019c8b7
commit 239f0ec982
2 changed files with 0 additions and 21 deletions
-1
View File
@@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libtiff,$(LIBTIFF_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,libtiff,\
external/libtiff/libtiff.linknolibs.patch \
external/libtiff/0001-ofz-54685-Timeout.patch \
external/libtiff/ofz68840.patch \
))
# vim: set noet sw=4 ts=4:
-20
View File
@@ -1,20 +0,0 @@
--- a/libtiff/tif_strip.c
+++ b/libtiff/tif_strip.c
@@ -159,10 +159,13 @@
_TIFFMultiply64(tif, samplingrow_size, samplingblocks_ver, module));
}
else
- return (_TIFFMultiply64(tif, nrows,
- isStrip ? TIFFScanlineSize64(tif)
- : TIFFTileRowSize64(tif),
- module));
+ {
+ uint64_t row_size = isStrip ? TIFFScanlineSize64(tif) : 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));
+ }
}
/*