diff --git a/external/libtiff/UnpackedTarball_libtiff.mk b/external/libtiff/UnpackedTarball_libtiff.mk index 52b56a498b0a..d799953bebb1 100644 --- a/external/libtiff/UnpackedTarball_libtiff.mk +++ b/external/libtiff/UnpackedTarball_libtiff.mk @@ -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: diff --git a/external/libtiff/ofz68840.patch b/external/libtiff/ofz68840.patch deleted file mode 100644 index b0fe57e5b30c..000000000000 --- a/external/libtiff/ofz68840.patch +++ /dev/null @@ -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)); -+ } - } - - /*