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>
diff --git a/download.lst b/download.lst
index d1d9537..b3c852e 100644
--- a/download.lst
+++ b/download.lst
@@ -200,8 +200,8 @@ export PIXMAN_SHA256SUM := ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e
export PIXMAN_TARBALL := pixman-0.42.2.tar.gz
export LIBPNG_SHA256SUM := 1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937
export LIBPNG_TARBALL := libpng-1.6.39.tar.xz
export LIBTIFF_SHA256SUM := 49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1
export LIBTIFF_TARBALL := tiff-4.4.0.tar.xz
export LIBTIFF_SHA256SUM := dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c
export LIBTIFF_TARBALL := tiff-4.5.0rc3.tar.xz
export POPPLER_SHA256SUM := d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0
export POPPLER_TARBALL := poppler-22.12.0.tar.xz
export POPPLER_DATA_SHA256SUM := 2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
diff --git a/external/libtiff/0001-add-16bit-cielab-support.patch b/external/libtiff/0001-add-16bit-cielab-support.patch
deleted file mode 100644
index 3ee6c3f..0000000
--- a/external/libtiff/0001-add-16bit-cielab-support.patch
+++ /dev/null
@@ -1,164 +0,0 @@
From 87cf58d0604e4bfd70da1044894c3e8f073133a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Sun, 22 May 2022 14:20:21 +0100
Subject: [PATCH] add 16bit-cielab support
add an internal TIFFCIELab16ToXYZ that assumes 16bit encoding
multiply the 8bit variant input to use that, keep TIFFCIELabToXYZ
unchanged so no different to existing potential consumers
motivation: https://bugs.documentfoundation.org/show_bug.cgi?id=131199
the "clavijo16bitlab.tiff" example where tiffinfo says:
Image Width: 2601 Image Length: 3503
Resolution: 96, 96 pixels/inch
Bits/Sample: 16
Compression Scheme: AdobeDeflate
Photometric Interpretation: CIE L*a*b*
Orientation: row 0 top, col 0 lhs
Samples/Pixel: 3
Rows/Strip: 1
Planar Configuration: single image plane
DateTime: 2020:03:07 10:20:42
---
libtiff/tif_color.c | 19 ++++++++++++++++---
libtiff/tif_getimage.c | 38 ++++++++++++++++++++++++++++++++++----
libtiff/tiffiop.h | 2 ++
3 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/libtiff/tif_color.c b/libtiff/tif_color.c
index 20e41684..e0fc4bf0 100644
--- libtiff/tif_color.c
+++ libtiff/tif_color.c
@@ -44,7 +44,20 @@ void
TIFFCIELabToXYZ(TIFFCIELabToRGB *cielab, uint32_t l, int32_t a, int32_t b,
float *X, float *Y, float *Z)
{
- float L = (float)l * 100.0F / 255.0F;
+ TIFFCIELab16ToXYZ(cielab, l * 257, a * 256, b * 256, X, Y, Z);
+}
+
+/*
+ * For CIELab encoded in 16 bits, L is an unsigned integer range [0,65535].
+ * The a* and b* components are signed integers range [-32768,32767]. The 16
+ * bit chrominance values are encoded as 256 times the 1976 CIE a* and b*
+ * values
+ */
+void
+TIFFCIELab16ToXYZ(TIFFCIELabToRGB *cielab, uint32_t l, int32_t a, int32_t b,
+ float *X, float *Y, float *Z)
+{
+ float L = (float)l * 100.0F / 65535.0F;
float cby, tmp;
if( L < 8.856F ) {
@@ -55,13 +68,13 @@ TIFFCIELabToXYZ(TIFFCIELabToRGB *cielab, uint32_t l, int32_t a, int32_t b,
*Y = cielab->Y0 * cby * cby * cby;
}
- tmp = (float)a / 500.0F + cby;
+ tmp = (float)a / 256.0F / 500.0F + cby;
if( tmp < 0.2069F )
*X = cielab->X0 * (tmp - 0.13793F) / 7.787F;
else
*X = cielab->X0 * tmp * tmp * tmp;
- tmp = cby - (float)b / 200.0F;
+ tmp = cby - (float)b / 256.0F / 200.0F;
if( tmp < 0.2069F )
*Z = cielab->Z0 * (tmp - 0.13793F) / 7.787F;
else
diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
index a1b6570b..9e2ac2c9 100644
--- libtiff/tif_getimage.c
+++ libtiff/tif_getimage.c
@@ -194,7 +194,7 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
}
break;
case PHOTOMETRIC_CIELAB:
- if ( td->td_samplesperpixel != 3 || colorchannels != 3 || td->td_bitspersample != 8 ) {
+ if ( td->td_samplesperpixel != 3 || colorchannels != 3 || (td->td_bitspersample != 8 && td->td_bitspersample != 16) ) {
sprintf(emsg,
"Sorry, can not handle image with %s=%"PRIu16", %s=%d and %s=%"PRIu16,
"Samples/pixel", td->td_samplesperpixel,
@@ -1784,7 +1784,7 @@ DECLARESepPutFunc(putRGBUAseparate16bittile)
/*
* 8-bit packed CIE L*a*b 1976 samples => RGB
*/
-DECLAREContigPutFunc(putcontig8bitCIELab)
+DECLAREContigPutFunc(putcontig8bitCIELab8)
{
float X, Y, Z;
uint32_t r, g, b;
@@ -1806,6 +1806,32 @@ DECLAREContigPutFunc(putcontig8bitCIELab)
}
}
+/*
+ * 16-bit packed CIE L*a*b 1976 samples => RGB
+ */
+DECLAREContigPutFunc(putcontig8bitCIELab16)
+{
+ float X, Y, Z;
+ uint32_t r, g, b;
+ uint16_t *wp = (uint16_t *)pp;
+ (void) y;
+ fromskew *= 3;
+ for( ; h > 0; --h) {
+ for (x = w; x > 0; --x) {
+ TIFFCIELab16ToXYZ(img->cielab,
+ (uint16_t)wp[0],
+ (int16_t)wp[1],
+ (int16_t)wp[2],
+ &X, &Y, &Z);
+ TIFFXYZToRGB(img->cielab, X, Y, Z, &r, &g, &b);
+ *cp++ = PACK(r, g, b);
+ wp += 3;
+ }
+ cp += toskew;
+ wp += fromskew;
+ }
+}
+
/*
* YCbCr -> RGB conversion and packing routines.
*/
@@ -2395,7 +2421,11 @@ initCIELabConversion(TIFFRGBAImage* img)
return NULL;
}
- return putcontig8bitCIELab;
+ if (img->bitspersample == 8)
+ return putcontig8bitCIELab8;
+ else if (img->bitspersample == 16)
+ return putcontig8bitCIELab16;
+ return NULL;
}
/*
@@ -2777,7 +2807,7 @@ PickContigCase(TIFFRGBAImage* img)
break;
case PHOTOMETRIC_CIELAB:
if (img->samplesperpixel == 3 && buildMap(img)) {
- if (img->bitspersample == 8)
+ if (img->bitspersample == 8 || img->bitspersample == 16)
img->put.contig = initCIELabConversion(img);
break;
}
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h
index e3af461d..7bd50514 100644
--- libtiff/tiffiop.h
+++ libtiff/tiffiop.h
@@ -429,6 +429,8 @@ extern int TIFFInitZSTD(TIFF*, int);
extern int TIFFInitWebP(TIFF*, int);
#endif
extern const TIFFCodec _TIFFBuiltinCODECS[];
+extern void TIFFCIELab16ToXYZ(TIFFCIELabToRGB *, uint32_t l, int32_t a, int32_t b,
+ float *, float *, float *);
#if defined(__cplusplus)
}
--
2.36.1
diff --git a/external/libtiff/UnpackedTarball_libtiff.mk b/external/libtiff/UnpackedTarball_libtiff.mk
index 3e7abee..ce5a3a5 100644
--- a/external/libtiff/UnpackedTarball_libtiff.mk
+++ b/external/libtiff/UnpackedTarball_libtiff.mk
@@ -15,8 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libtiff,0))
$(eval $(call gb_UnpackedTarball_add_patches,libtiff,\
external/libtiff/libtiff.linknolibs.patch \
external/libtiff/0001-add-16bit-cielab-support.patch \
external/libtiff/include.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libtiff/include.patch b/external/libtiff/include.patch
deleted file mode 100644
index 0b65262..0000000
--- a/external/libtiff/include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
--- libtiff/tif_lzw.c
+++ libtiff/tif_lzw.c
@@ -39,6 +39,7 @@
#include <stdbool.h>
#include <stdio.h>
+#include <stdlib.h>
/* Select the plausible largest natural integer type for the architecture */
#define SIZEOF_WORDTYPE SIZEOF_SIZE_T
