commit 5b74eb7d41bbcf2d35154ae8272f0e71be128b60
author Caolán McNamara <caolanm@redhat.com> Sun May 22 14:12:13 2022 +0100
committer Caolán McNamara <caolanm@redhat.com> Sun May 22 21:30:20 2022 +0200
tree 5329bd58596665b978efae059e05053268788efe
parent 4f0b60d88fb3d7502ae9a820daa31b192cc6234d

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>

external/libtiff/UnpackedTarball_libtiff.mk

diff --git a/external/libtiff/UnpackedTarball_libtiff.mk b/external/libtiff/UnpackedTarball_libtiff.mk
index ce5a3a5..ee3d4ab 100644
--- a/external/libtiff/UnpackedTarball_libtiff.mk
+++ b/external/libtiff/UnpackedTarball_libtiff.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libtiff,0))

$(eval $(call gb_UnpackedTarball_add_patches,libtiff,\
    external/libtiff/libtiff.linknolibs.patch \
    external/libtiff/libtiff.16bitcielab.patch \
))

# vim: set noet sw=4 ts=4:

external/libtiff/libtiff.16bitcielab.patch

diff --git a/external/libtiff/libtiff.16bitcielab.patch b/external/libtiff/libtiff.16bitcielab.patch
new file mode 100644
index 0000000..cecce9c
--- /dev/null
+++ b/external/libtiff/libtiff.16bitcielab.patch
@@ -0,0 +1,75 @@
--- libtiff/tif_getimage.c	2021-03-05 13:01:43.000000000 +0000
+++ libtiff/tif_getimage.c	2022-05-22 14:05:56.320883484 +0100
@@ -194,7 +194,7 @@
                         }
 			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 @@
 /*
  * 8-bit packed CIE L*a*b 1976 samples => RGB
  */
-DECLAREContigPutFunc(putcontig8bitCIELab)
+DECLAREContigPutFunc(putcontig8bitCIELab8)
 {
 	float X, Y, Z;
 	uint32_t r, g, b;
@@ -1807,6 +1807,32 @@
 }
 
 /*
+ * 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) {
+			TIFFCIELabToXYZ(img->cielab,
+					wp[0] / 256,
+					wp[1] / 256,
+					wp[2] / 256,
+					&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 @@
 		return NULL;
 	}
 
-	return putcontig8bitCIELab;
+	if (img->bitspersample == 8)
+		return putcontig8bitCIELab8;
+	else if (img->bitspersample == 16)
+		return putcontig8bitCIELab16;
+	return NULL;
 }
 
 /*
@@ -2777,7 +2807,7 @@
 			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;
 			}