[neon/qt/qtimageformats/Neon/unstable] debian: Drop tiff_memory_mapping.diff, included in the new release.

[Dmitry Shachnev]

Git commit 2af057205e634c6ab1cca10108d1783eb9965884 by Dmitry Shachnev.
Committed on 09/03/2024 at 12:14.
Pushed by jriddell into branch 'Neon/unstable'.

Drop tiff_memory_mapping.diff, included in the new release.

M  +1    -0    debian/changelog
D  +0    -1    debian/patches/series
D  +0    -60   debian/patches/tiff_memory_mapping.diff

https://invent.kde.org/neon/qt/qtimageformats/-/commit/2af057205e634c6ab1cca10108d1783eb9965884

diff --git a/debian/changelog b/debian/changelog
index 2013ad3..ceedc1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtimageformats-opensource-src (5.15.13-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.15.13.
   * Update debian/copyright.
+  * Drop tiff_memory_mapping.diff, included in the new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 09 Mar 2024 14:42:16 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c449887..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-tiff_memory_mapping.diff
diff --git a/debian/patches/tiff_memory_mapping.diff b/debian/patches/tiff_memory_mapping.diff
deleted file mode 100644
index aa9a276..0000000
--- a/debian/patches/tiff_memory_mapping.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: implement support for file memory mapping for tiff reading
- libtiff will by default attempt to establish a memory map for reading
- a tiff file. Implement the callbacks to establish this in Qt's tiff
- handler, since this will save data copying, particularly in the case
- where the input file is already in memory as a resource or QBuffer.
- .
- Also, this makes sure that QTiffHandler utilizes libtiff's default,
- and hence best tested, code path for tiff decoding. Specifically, it
- avoids a hitting a bug that breaks reading of certain tiffs in the
- newly released libtiff version 4.5.0.
-Origin: upstream, https://code.qt.io/cgit/qt/qtimageformats.git/commit/?id=cd92d76e9dcd98f4
-Last-Update: 2023-01-12
-
---- a/src/plugins/imageformats/tiff/qtiffhandler.cpp
-+++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp
-@@ -43,6 +43,8 @@
- #include <qdebug.h>
- #include <qimage.h>
- #include <qglobal.h>
-+#include <qbuffer.h>
-+#include <qfiledevice.h>
- extern "C" {
- #include "tiffio.h"
- }
-@@ -90,13 +92,33 @@ toff_t qtiffSizeProc(thandle_t fd)
-     return static_cast<QIODevice *>(fd)->size();
- }
- 
--int qtiffMapProc(thandle_t /*fd*/, tdata_t* /*pbase*/, toff_t* /*psize*/)
-+int qtiffMapProc(thandle_t fd, void **base, toff_t *size)
- {
-+    QIODevice *device = static_cast<QIODevice *>(fd);
-+
-+    QFileDevice *file = qobject_cast<QFileDevice *>(device);
-+    if (file) {
-+        *base = file->map(0, file->size());
-+        if (*base != nullptr) {
-+            *size = file->size();
-+            return 1;
-+        }
-+    } else {
-+        QBuffer *buf = qobject_cast<QBuffer *>(device);
-+        if (buf) {
-+            *base = const_cast<char *>(buf->data().constData());
-+            *size = buf->size();
-+            return 1;
-+        }
-+    }
-     return 0;
- }
- 
--void qtiffUnmapProc(thandle_t /*fd*/, tdata_t /*base*/, toff_t /*size*/)
-+void qtiffUnmapProc(thandle_t fd, void *base, toff_t /*size*/)
- {
-+    QFileDevice *file = qobject_cast<QFileDevice *>(static_cast<QIODevice *>(fd));
-+    if (file && base)
-+        file->unmap(static_cast<uchar *>(base));
- }
- 
-