Update qtimageformats to latest "dev" (649100f)

Author: AlienCowEatCake

src/ThirdParty/QtImageFormats/patches/qtimageformats/0001-Use-Q_DECL_OVERRIDE-instead-of-override.patch

@@ -1,18 +1,18 @@
-From ef1b4549d244a391335621473792857e57fd460e Mon Sep 17 00:00:00 2001
+From 08f1e18405e2c432f4252705bd3b98a563d761a3 Mon Sep 17 00:00:00 2001
 From: Peter Zhigalov <[email protected]>
 Date: Sat, 10 Mar 2018 15:40:08 +0700
 Subject: [PATCH 1/4] Use "Q_DECL_OVERRIDE" instead of "override"
 
 ---
- src/plugins/imageformats/dds/qddshandler.h     | 18 +++++++++---------
- src/plugins/imageformats/icns/qicnshandler_p.h | 18 +++++++++---------
- src/plugins/imageformats/jp2/qjp2handler_p.h   | 14 +++++++-------
- src/plugins/imageformats/mng/qmnghandler_p.h   | 26 +++++++++++++-------------
- src/plugins/imageformats/tga/qtgafile.cpp      |  6 +++---
- src/plugins/imageformats/tga/qtgahandler.h     | 12 ++++++------
- src/plugins/imageformats/tiff/qtiffhandler_p.h | 22 +++++++++++-----------
- src/plugins/imageformats/wbmp/qwbmphandler_p.h | 10 +++++-----
- src/plugins/imageformats/webp/qwebphandler_p.h | 24 ++++++++++++------------
+ src/plugins/imageformats/dds/qddshandler.h    | 18 ++++++-------
+ .../imageformats/icns/qicnshandler_p.h        | 18 ++++++-------
+ src/plugins/imageformats/jp2/qjp2handler_p.h  | 14 +++++-----
+ src/plugins/imageformats/mng/qmnghandler_p.h  | 26 +++++++++----------
+ src/plugins/imageformats/tga/qtgafile.cpp     |  6 ++---
+ src/plugins/imageformats/tga/qtgahandler.h    | 12 ++++-----
+ .../imageformats/tiff/qtiffhandler_p.h        | 22 ++++++++--------
+ .../imageformats/wbmp/qwbmphandler_p.h        | 10 +++----
+ .../imageformats/webp/qwebphandler_p.h        | 24 ++++++++---------
  9 files changed, 75 insertions(+), 75 deletions(-)
 
 diff --git a/src/plugins/imageformats/dds/qddshandler.h b/src/plugins/imageformats/dds/qddshandler.h
@@ -301,5 +301,5 @@ index 950b501..5126692 100644
  private:
      bool ensureScanned() const;
 -- 
-2.14.2
+2.17.1
 

src/ThirdParty/QtImageFormats/patches/qtimageformats/0002-Dont-use-modern-options-with-old-Qt-verson.patch

@@ -1,13 +1,13 @@
-From d02eaf5fc9e0b7a64f812f6f5cbb2dabeba1e7eb Mon Sep 17 00:00:00 2001
+From 6e51e3bab1ef2a140fc17d97bfc94a29e7340034 Mon Sep 17 00:00:00 2001
 From: Peter Zhigalov <[email protected]>
-Date: Sun, 14 May 2017 23:12:38 +0700
+Date: Sun, 17 Jun 2018 19:52:22 +0700
 Subject: [PATCH 2/4] Dont use modern options with old Qt verson
 
 ---
- src/plugins/imageformats/dds/qddshandler.cpp   | 7 ++++++-
- src/plugins/imageformats/jp2/qjp2handler.cpp   | 7 +++++++
- src/plugins/imageformats/webp/qwebphandler.cpp | 4 ++++
- 3 files changed, 17 insertions(+), 1 deletion(-)
+ src/plugins/imageformats/dds/qddshandler.cpp  |  7 ++++++-
+ src/plugins/imageformats/jp2/qjp2handler.cpp  |  7 +++++++
+ .../imageformats/webp/qwebphandler.cpp        | 20 +++++++++++++++++++
+ 3 files changed, 33 insertions(+), 1 deletion(-)
 
 diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp
 index 3a44b51..dab69d5 100644
@@ -56,12 +56,12 @@ index 17373fd..da74fb2 100644
      }
 
 diff --git a/src/plugins/imageformats/webp/qwebphandler.cpp b/src/plugins/imageformats/webp/qwebphandler.cpp
-index 3a7bf43..13ea7fa 100644
+index 578a701..d861db4 100644
 --- a/src/plugins/imageformats/webp/qwebphandler.cpp
 +++ b/src/plugins/imageformats/webp/qwebphandler.cpp
-@@ -176,7 +176,11 @@ bool QWebpHandler::read(QImage *image)
- 
-     QImage frame(m_iter.width, m_iter.height, QImage::Format_ARGB32);
+@@ -177,7 +177,11 @@ bool QWebpHandler::read(QImage *image)
+     QImage::Format format = m_features.has_alpha ? QImage::Format_ARGB32 : QImage::Format_RGB32;
+     QImage frame(m_iter.width, m_iter.height, format);
      uint8_t *output = frame.bits();
 +#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
      size_t output_size = frame.sizeInBytes();
@@ -71,6 +71,41 @@ index 3a7bf43..13ea7fa 100644
  #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
      if (!WebPDecodeBGRAInto(
          reinterpret_cast<const uint8_t*>(m_iter.fragment.bytes), m_iter.fragment.size,
+@@ -221,7 +225,11 @@ bool QWebpHandler::write(const QImage &image)
+ 
+     QImage srcImage = image;
+     bool alpha = srcImage.hasAlphaChannel();
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+     QImage::Format newFormat = alpha ? QImage::Format_RGBA8888 : QImage::Format_RGB888;
++#else
++    QImage::Format newFormat = alpha ? QImage::Format_ARGB32 : QImage::Format_RGB32;
++#endif
+     if (srcImage.format() != newFormat)
+         srcImage = srcImage.convertToFormat(newFormat);
+ 
+@@ -237,10 +245,22 @@ bool QWebpHandler::write(const QImage &image)
+     picture.height = srcImage.height();
+     picture.use_argb = 1;
+     bool failed = false;
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+     if (alpha)
+         failed = !WebPPictureImportRGBA(&picture, srcImage.bits(), srcImage.bytesPerLine());
+     else
+         failed = !WebPPictureImportRGB(&picture, srcImage.bits(), srcImage.bytesPerLine());
++#else
++# if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
++    if (alpha)
++        failed = !WebPPictureImportBGRA(&picture, srcImage.bits(), srcImage.bytesPerLine());
++    else
++        failed = !WebPPictureImportBGRX(&picture, srcImage.bits(), srcImage.bytesPerLine());
++# else /* Q_BIG_ENDIAN */
++    qWarning() << "QWebpHandler::write is not implemented for big endian systems with Qt < 5.2";
++    failed = true;
++# endif
++#endif
+ 
+     if (failed) {
+         qWarning() << "failed to import image data to webp picture.";
 -- 
-2.14.2
+2.17.1
 

src/ThirdParty/QtImageFormats/patches/qtimageformats/0003-Use-custom-third-party-libraries-paths.patch

@@ -1,7 +1,7 @@
-From 626bbd164d711a699685e1f95ead1e4ff3d29e6f Mon Sep 17 00:00:00 2001
+From 6ae19c4845835e81a08ce7920d483a444111083b Mon Sep 17 00:00:00 2001
 From: Peter Zhigalov <[email protected]>
 Date: Sun, 14 May 2017 23:13:29 +0700
-Subject: [PATCH 3/3] Use custom third-party libraries paths
+Subject: [PATCH 3/4] Use custom third-party libraries paths
 
 ---
  src/3rdparty/zlib_dependency.pri             | 11 ++++++-----
@@ -69,5 +69,5 @@ index 5c0fff1..25a2939 100644
 +#    *-g++*: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter
 +#}
 -- 
-2.13.0
+2.17.1
 

src/ThirdParty/QtImageFormats/patches/qtimageformats/0004-Fix-handling-icns-files-with-JPEG-2000-frames.patch

@@ -1,4 +1,4 @@
-From 88843aa58e17bf2d92196e7e0e848cdb4396c4d9 Mon Sep 17 00:00:00 2001
+From ddc936f884b8f1dc5e4daa67f0020d0d9e1f2ca2 Mon Sep 17 00:00:00 2001
 From: Peter Zhigalov <[email protected]>
 Date: Mon, 15 May 2017 00:06:30 +0700
 Subject: [PATCH 4/4] Fix handling icns files with JPEG 2000 frames
@@ -41,5 +41,5 @@ index a854506..981f367 100644
              if (format == 0)
                  format = "unknown";
 -- 
-2.13.0
+2.17.1
 

src/ThirdParty/QtImageFormats/qtimageformats/.qmake.conf

@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.11.0
+MODULE_VERSION = 5.12.0

src/ThirdParty/QtImageFormats/qtimageformats/.tag

@@ -1 +1 @@
-f878323a82fa69fcaeb37b42e10ba28759157f47
+649100fa0e1ab5443e8fa31b6642ee05b1e41835

src/ThirdParty/QtImageFormats/qtimageformats/LGPL_EXCEPTION.txt

@@ -0,0 +1,30 @@
+Qt 5.11 introduces many new features and improvements as well as bugfixes
+over the 5.10.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.11 series is binary compatible with the 5.10.x series.
+Applications compiled for 5.10 will continue to run with 5.11.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                            Qt 5.11.0 Changes                             *
+****************************************************************************
+
+Third-Party Code
+----------------
+
+ - Bundled libwebp was updated to version 0.6.1
+
+Native Darwin jp2 and heic handlers
+-----------------------------------
+
+ - iOS support fixed

src/ThirdParty/QtImageFormats/qtimageformats/dist/changes-5.11.0

@@ -0,0 +1,24 @@
+Qt 5.9.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.9 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                            Qt 5.9.5 Changes                              *
+****************************************************************************
+
+ - This release contains only minor code improvements.

src/ThirdParty/QtImageFormats/qtimageformats/dist/changes-5.9.5

@@ -0,0 +1,24 @@
+Qt 5.9.6 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0 through 5.9.5.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                              Qt 5.9.6 Changes                            *
+****************************************************************************
+
+ - This release contains only minor code improvements.