Patch the Qt tiff gtimageio plugin

This adds support for high bit-depth tiffs

CCBUG:408731

3rdparty/ext_qt/CMakeLists.txt

@@ -36,6 +36,7 @@ if (WIN32)
     set(ext_qt_PATCH_COMMAND
                      ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0001-Use-fast-path-for-unsupported-mime-types.patch
             COMMAND  ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0002-Hack-always-return-we-support-DIBV5.patch
+            COMMAND  ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/tiff.patch
             )
 
     # Tablet support patches
@@ -109,6 +110,7 @@ elseif (NOT APPLE)
 
       PATCH_COMMAND  ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0012-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
             COMMAND  ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0013-Poison-Qt-s-headers-with-a-mark-about-presence-of-En.patch
+            COMMAND  ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/tiff.patch
 
       CMAKE_ARGS -DOPENSSL_LIBS='-L${EXTPREFIX_qt}/lib -lssl -lcrypto'
 
@@ -214,6 +216,7 @@ else( APPLE )
         set(ext_qt_PATCH_COMMAND ${PATCH_COMMAND}} -p1 -b -d <SOURCE_DIR>/qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/mac_standardpaths_qtbug-61159.diff
                 COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0012-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
                 COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0013-Poison-Qt-s-headers-with-a-mark-about-presence-of-En.patch
+                COMMAND  ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/tiff.patch
 
                 #COMMAND ${PATCH_COMMAND} -p1 -b -d <SOURCE_DIR>/qtbase/mkspecs/features/mac -i ${CMAKE_CURRENT_SOURCE_DIR}/mac-default.patch
             )

3rdparty/ext_qt/tiff.patch

+diff --git a/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp b/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp
+index e6c71753a..cd70fb9fa 100644
+--- a/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp
++++ b/qtimageformats/src/plugins/imageformats/tiff/qtiffhandler.cpp
+@@ -272,6 +272,8 @@ bool QTiffHandlerPrivate::readHeaders(QIODevice *device)
+         format = QImage::Format_Mono;
+     else if (photometric == PHOTOMETRIC_MINISBLACK && bitPerSample == 8 && samplesPerPixel == 1)
+         format = QImage::Format_Grayscale8;
++    else if (photometric == PHOTOMETRIC_MINISBLACK && bitPerSample == 16 && samplesPerPixel == 1)
++        format = QImage::Format_Grayscale16;
+     else if ((grayscale || photometric == PHOTOMETRIC_PALETTE) && bitPerSample == 8 && samplesPerPixel == 1)
+         format = QImage::Format_Indexed8;
+     else if (samplesPerPixel < 4)
+@@ -402,9 +404,11 @@ bool QTiffHandler::read(QImage *image)
+         }
+     }
+     bool format8bit = (format == QImage::Format_Mono || format == QImage::Format_Indexed8 || format == QImage::Format_Grayscale8);
++    bool format16bit = (format == QImage::Format_Grayscale16);
+     bool format64bit = (format == QImage::Format_RGBX64 || format == QImage::Format_RGBA64 || format == QImage::Format_RGBA64_Premultiplied);
+ 
+-    if (format8bit || format64bit) {
++    // Formats we read directly, instead of over RGBA32:
++    if (format8bit || format16bit || format64bit) {
+         int bytesPerPixel = image->depth() / 8;
+         if (format == QImage::Format_RGBX64)
+             bytesPerPixel = 6;
+@@ -513,6 +517,7 @@ static QVector<QRgb> effectiveColorTable(const QImage &image)
+             colors[i] = qRgba(0, 0, 0, i);
+         break;
+     case QImage::Format_Grayscale8:
++    case QImage::Format_Grayscale16:
+         colors.resize(256);
+         for (int i = 0; i < 256; ++i)
+             colors[i] = qRgb(i, i, i);
+@@ -622,6 +627,7 @@ bool QTiffHandler::write(const QImage &image)
+         TIFFClose(tiff);
+     } else if (format == QImage::Format_Indexed8
+                || format == QImage::Format_Grayscale8
++               || format == QImage::Format_Grayscale16
+                || format == QImage::Format_Alpha8) {
+         QVector<QRgb> colorTable = effectiveColorTable(image);
+         bool isGrayscale = checkGrayscale(colorTable);
+@@ -631,7 +637,7 @@ bool QTiffHandler::write(const QImage &image)
+                 photometric = PHOTOMETRIC_MINISWHITE;
+             if (!TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, photometric)
+                     || !TIFFSetField(tiff, TIFFTAG_COMPRESSION, compression == NoCompression ? COMPRESSION_NONE : COMPRESSION_LZW)
+-                    || !TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 8)
++                    || !TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, image.depth())
+                     || !TIFFSetField(tiff, TIFFTAG_ROWSPERSTRIP, defaultStripSize(tiff))) {
+                 TIFFClose(tiff);
+                 return false;