Hello community,
here is the log from the commit of package libqt5-qtimageformats for
openSUSE:Factory checked in at 2019-06-28 16:28:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtimageformats (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtimageformats.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtimageformats"
Fri Jun 28 16:28:18 2019 rev:34 rq:711184 version:5.13.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtimageformats/libqt5-qtimageformats.changes
2019-04-26 22:53:04.717368163 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtimageformats.new.4615/libqt5-qtimageformats.changes
2019-06-28 16:28:54.842149643 +0200
@@ -1,0 +2,27 @@
+Wed Jun 19 11:24:00 UTC 2019 - [email protected]
+
+- Update to 5.13.0:
+ * New bugfix release
+ * No changelog available
+ * For more details about Qt 5.13 please see:
+ *
http://code.qt.io/cgit/qt/qtimageformats.git/plain/dist/changes-5.13.0/?h=5.13
+
+-------------------------------------------------------------------
+Tue Jun 4 07:24:49 UTC 2019 - [email protected]
+
+- Update to 5.13.0-rc:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Mon Apr 29 09:16:41 UTC 2019 - [email protected]
+
+- Update to 5.13.0-beta2:
+ * Switched to new configuration system
+ * New bugfix release
+ * No changelog available
+- Refresh jas_version.patch
+- Add "-mng" to force-enable mng support, was implicitly enabled before
+- Add "-system-tiff -system-webp" to enforce use of system libs
+
+-------------------------------------------------------------------
@@ -9,0 +37,8 @@
+Thu Mar 21 10:25:41 UTC 2019 - [email protected]
+
+- Update to 5.13.0-beta1:
+ * New feature release
+ * For more details about Qt 5.13 please see:
+ *
http://code.qt.io/cgit/qt/qtimageformats.git/plain/dist/changes-5.13.0/?h=5.13
+
+-------------------------------------------------------------------
@@ -493,0 +529 @@
+
Old:
----
qtimageformats-everywhere-src-5.12.3.tar.xz
New:
----
qtimageformats-everywhere-src-5.13.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtimageformats.spec ++++++
--- /var/tmp/diff_new_pack.iFUS1Z/_old 2019-06-28 16:28:56.258151783 +0200
+++ /var/tmp/diff_new_pack.iFUS1Z/_new 2019-06-28 16:28:56.290151831 +0200
@@ -19,17 +19,17 @@
%define qt5_snapshot 0
Name: libqt5-qtimageformats
-Version: 5.12.3
+Version: 5.13.0
Release: 0
Summary: Qt 5 Image Format Plugins
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
-%define real_version 5.12.3
-%define so_version 5.12.3
-%define tar_version qtimageformats-everywhere-src-5.12.3
-Source:
https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz
+%define real_version 5.13.0
+%define so_version 5.13.0
+%define tar_version qtimageformats-everywhere-src-5.13.0
+Source:
https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE jas_version.patch
Patch0: jas_version.patch
@@ -80,7 +80,7 @@
#force the configure script to generate the forwarding headers (it checks
whether .git directory exists)
mkdir .git
%endif
-%qmake5
+%qmake5 -- -system-tiff -system-webp -mng
%make_jobs
%install
++++++ jas_version.patch ++++++
--- /var/tmp/diff_new_pack.iFUS1Z/_old 2019-06-28 16:28:56.634152351 +0200
+++ /var/tmp/diff_new_pack.iFUS1Z/_new 2019-06-28 16:28:56.662152393 +0200
@@ -1,11 +1,13 @@
---- qtimageformats-opensource-src-5.8.0/config.tests/jasper/jasper.cpp
2016-12-13 12:06:00.000000000 +0100
-+++ qtimageformats-opensource-src-5.8.0.new/config.tests/jasper/jasper.cpp
2017-01-31 08:09:48.000000000 +0100
-@@ -28,7 +28,7 @@
- ****************************************************************************/
-
- #include <string.h>
--#include <jasper/jasper.h>
-+#include <jasper/jas_config.h>
-
- int main(int, char **)
- {
+Index:
qtimageformats-everywhere-src-5.13.0-beta2/src/imageformats/configure.json
+===================================================================
+---
qtimageformats-everywhere-src-5.13.0-beta2.orig/src/imageformats/configure.json
++++ qtimageformats-everywhere-src-5.13.0-beta2/src/imageformats/configure.json
+@@ -22,7 +22,7 @@
+ "test": {
+ "include": [
+ "string.h",
+- "jasper/jasper.h"
++ "jasper/jas_config.h"
+ ],
+ "qmake": [
+ "msvc: LIBS += libjasper.lib",
++++++ qtimageformats-everywhere-src-5.12.3.tar.xz ->
qtimageformats-everywhere-src-5.13.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-5.12.3/.qmake.conf
new/qtimageformats-everywhere-src-5.13.0/.qmake.conf
--- old/qtimageformats-everywhere-src-5.12.3/.qmake.conf 2019-04-02
14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/.qmake.conf 2019-05-08
10:46:43.000000000 +0200
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.12.3
+MODULE_VERSION = 5.13.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-5.12.3/.tag
new/qtimageformats-everywhere-src-5.13.0/.tag
--- old/qtimageformats-everywhere-src-5.12.3/.tag 2019-04-02
14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/.tag 2019-05-08
10:46:43.000000000 +0200
@@ -1 +1 @@
-17ac003f6072e62ba9de7e75f3de8b8509dcd2c3
+a743e1427b4ce9b4f1c43d3456679c09cee7b4e0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/config.tests/jasper/jasper.cpp
new/qtimageformats-everywhere-src-5.13.0/config.tests/jasper/jasper.cpp
--- old/qtimageformats-everywhere-src-5.12.3/config.tests/jasper/jasper.cpp
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/config.tests/jasper/jasper.cpp
1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Copyright (C) 2016 Petroules Corporation.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests in the Qt ImageFormats module.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <string.h>
-#include <jasper/jasper.h>
-
-int main(int, char **)
-{
- // This version of Jasper is broken, according to the old Qt Solutions docs
- if (strcmp(JAS_VERSION, "1.900.0") == 0)
- return 1;
-
- return 0;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/config.tests/jasper/jasper.pro
new/qtimageformats-everywhere-src-5.13.0/config.tests/jasper/jasper.pro
--- old/qtimageformats-everywhere-src-5.12.3/config.tests/jasper/jasper.pro
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/config.tests/jasper/jasper.pro
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-SOURCES = jasper.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
-win32:CONFIG += console
-msvc: LIBS += libjasper.lib
-else: LIBS += -ljasper
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/config.tests/libmng/libmng.cpp
new/qtimageformats-everywhere-src-5.13.0/config.tests/libmng/libmng.cpp
--- old/qtimageformats-everywhere-src-5.12.3/config.tests/libmng/libmng.cpp
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/config.tests/libmng/libmng.cpp
1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests in the Qt ImageFormats module.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <stdio.h>
-#include <libmng.h>
-
-int main(int, char **)
-{
- mng_handle hMNG;
- mng_cleanup(&hMNG);
-
-#if defined(MNG_VERSION_MAJOR)
-#if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0
&& MNG_VERSION_RELEASE < 9)
-#error System libmng version is less than 1.0.9.
-#endif
-#endif
-
- return 0;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/config.tests/libmng/libmng.pro
new/qtimageformats-everywhere-src-5.13.0/config.tests/libmng/libmng.pro
--- old/qtimageformats-everywhere-src-5.12.3/config.tests/libmng/libmng.pro
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/config.tests/libmng/libmng.pro
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-SOURCES = libmng.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
-win32:CONFIG += console
-unix|mingw: LIBS += -lmng
-else:win32: LIBS += libmng.lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/config.tests/libtiff/libtiff.cpp
new/qtimageformats-everywhere-src-5.13.0/config.tests/libtiff/libtiff.cpp
--- old/qtimageformats-everywhere-src-5.12.3/config.tests/libtiff/libtiff.cpp
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/config.tests/libtiff/libtiff.cpp
1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <tiffio.h>
-
-#if !defined(TIFF_VERSION) && defined(TIFF_VERSION_CLASSIC)
-// libtiff 4.0 splits it into TIFF_VERSION_CLASSIC and TIFF_VERSION_BIG
-# define TIFF_VERSION TIFF_VERSION_CLASSIC
-#endif
-
-#if !defined(TIFF_VERSION)
-# error "Required libtiff not found"
-#elif TIFF_VERSION < 42
-# error "unsupported tiff version"
-#endif
-
-int main(int, char **)
-{
- tdata_t buffer = _TIFFmalloc(128);
- _TIFFfree(buffer);
-
- // some libtiff implementations where TIFF_VERSION >= 42 do not
- // have TIFFReadRGBAImageOriented(), so let's check for it
- TIFFReadRGBAImageOriented(0, 0, 0, 0, 0, 0);
-
- return 0;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/config.tests/libtiff/libtiff.pro
new/qtimageformats-everywhere-src-5.13.0/config.tests/libtiff/libtiff.pro
--- old/qtimageformats-everywhere-src-5.12.3/config.tests/libtiff/libtiff.pro
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/config.tests/libtiff/libtiff.pro
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-SOURCES = libtiff.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
-win32:CONFIG += console
-unix|mingw: LIBS += -ltiff
-else:win32: LIBS += libtiff.lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/config.tests/libwebp/libwebp.cpp
new/qtimageformats-everywhere-src-5.13.0/config.tests/libwebp/libwebp.cpp
--- old/qtimageformats-everywhere-src-5.12.3/config.tests/libwebp/libwebp.cpp
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/config.tests/libwebp/libwebp.cpp
1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests in the Qt ImageFormats module.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <webp/decode.h>
-#include <webp/encode.h>
-#include <webp/demux.h>
-
-#if WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) ||
WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202)
-#error "Incompatible libwebp version"
-#endif
-
-int main(int, char **)
-{
- WebPDecoderConfig config;
- WebPDecBuffer *output_buffer = &config.output;
- WebPBitstreamFeatures *bitstream = &config.input;
- WebPPicture picture;
- picture.use_argb = 0;
- WebPConfig config2;
- config2.lossless = 0;
- WebPData data = {};
- WebPDemuxer *demuxer = WebPDemux(&data);
- WebPIterator iter;
- iter.frame_num = 0;
-
- return 0;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/config.tests/libwebp/libwebp.pro
new/qtimageformats-everywhere-src-5.13.0/config.tests/libwebp/libwebp.pro
--- old/qtimageformats-everywhere-src-5.12.3/config.tests/libwebp/libwebp.pro
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/config.tests/libwebp/libwebp.pro
1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-SOURCES = libwebp.cpp
-CONFIG -= qt dylib
-mac:CONFIG -= app_bundle
-win32:CONFIG += console
-unix|mingw: LIBS += -lwebp -lwebpdemux
-else:win32: LIBS += libwebp.lib libwebpdemux.lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-5.12.3/config_help.txt
new/qtimageformats-everywhere-src-5.13.0/config_help.txt
--- old/qtimageformats-everywhere-src-5.12.3/config_help.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-5.13.0/config_help.txt 2019-05-08
10:46:43.000000000 +0200
@@ -0,0 +1,6 @@
+Further image format options:
+
+ -jasper .............. Enable JPEG-2000 support using the JasPer library [no]
+ -mng ................. Enable MNG support [no]
+ -tiff ................ Enable TIFF support [system/qt/no]
+ -webp ................ Enable WEBP support [system/qt/no]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-5.12.3/configure.json
new/qtimageformats-everywhere-src-5.13.0/configure.json
--- old/qtimageformats-everywhere-src-5.12.3/configure.json 1970-01-01
01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-5.13.0/configure.json 2019-05-08
10:46:43.000000000 +0200
@@ -0,0 +1,5 @@
+{
+ "subconfigs": [
+ "src/imageformats"
+ ]
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/dist/changes-5.13.0
new/qtimageformats-everywhere-src-5.13.0/dist/changes-5.13.0
--- old/qtimageformats-everywhere-src-5.12.3/dist/changes-5.13.0
1970-01-01 01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-5.13.0/dist/changes-5.13.0
2019-05-08 10:46:43.000000000 +0200
@@ -0,0 +1,31 @@
+Qt 5.13 introduces many new features and improvements as well as bugfixes
+over the 5.12.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+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.
+
+****************************************************************************
+* General *
+****************************************************************************
+
+ - The qtimageformats module now offers configuration settings
+ available in the global Qt configure. The image format handlers
+ based on external codecs can be enabled or disabled, and the choice
+ between bundled and system codec library can be set.
+
+****************************************************************************
+* TIFF *
+****************************************************************************
+
+ - Support for reading and writing images in Grayscale16 format added.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/qtimageformats.pro
new/qtimageformats-everywhere-src-5.13.0/qtimageformats.pro
--- old/qtimageformats-everywhere-src-5.12.3/qtimageformats.pro 2019-04-02
14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/qtimageformats.pro 2019-05-08
10:46:43.000000000 +0200
@@ -1,9 +1,3 @@
requires(qtHaveModule(gui))
-load(configure)
-qtCompileTest(jasper)
-qtCompileTest(libmng)
-qtCompileTest(libtiff)
-qtCompileTest(libwebp)
-
load(qt_parts)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/src/3rdparty/libwebp/src/dsp/dsp.h
new/qtimageformats-everywhere-src-5.13.0/src/3rdparty/libwebp/src/dsp/dsp.h
--- old/qtimageformats-everywhere-src-5.12.3/src/3rdparty/libwebp/src/dsp/dsp.h
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/src/3rdparty/libwebp/src/dsp/dsp.h
2019-05-08 10:46:43.000000000 +0200
@@ -55,12 +55,12 @@
#if !defined(EMSCRIPTEN)
#if defined(_MSC_VER) && _MSC_VER > 1310 && \
- (defined(_M_X64) || defined(_M_IX86))
+ (defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__)
#define WEBP_MSC_SSE2 // Visual C++ SSE2 targets
#endif
#if defined(_MSC_VER) && _MSC_VER >= 1500 && \
- (defined(_M_X64) || defined(_M_IX86))
+ (defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__)
#define WEBP_MSC_SSE41 // Visual C++ SSE4.1 targets
#endif
@@ -90,7 +90,7 @@
#define WEBP_USE_NEON
#endif
-#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM)
+#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) &&
!defined(__clang__)
#define WEBP_USE_NEON
#define WEBP_USE_INTRINSICS
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/src/imageformats/configure.json
new/qtimageformats-everywhere-src-5.13.0/src/imageformats/configure.json
--- old/qtimageformats-everywhere-src-5.12.3/src/imageformats/configure.json
1970-01-01 01:00:00.000000000 +0100
+++ new/qtimageformats-everywhere-src-5.13.0/src/imageformats/configure.json
2019-05-08 10:46:43.000000000 +0200
@@ -0,0 +1,211 @@
+{
+ "module": "imageformats",
+ "depends": [
+ "gui"
+ ],
+ "condition": "module.gui",
+
+ "commandline": {
+ "options": {
+ "jasper": { "type": "boolean" },
+ "mng": { "type": "boolean" },
+ "tiff": { "type": "enum", "values": [ "no", "qt", "system" ] },
+ "webp": { "type": "enum", "values": [ "no", "qt", "system" ] }
+ }
+ },
+
+ "libraries": {
+ "jasper": {
+ "label": "jasper",
+ "test": {
+ "label": "Jasper(header in /usr/include)",
+ "type": "compile",
+ "test": {
+ "include": [
+ "string.h",
+ "jasper/jasper.h"
+ ],
+ "qmake": [
+ "msvc: LIBS += libjasper.lib",
+ "else: LIBS += -ljasper"
+ ],
+ "main": [
+ "// This version of Jasper is broken, according to the
old Qt Solutions docs",
+ "if (strcmp(JAS_VERSION, \"1.900.0\") == 0)",
+ " return 1;",
+ "return 0;"
+ ]
+ }
+ },
+ "sources": [
+ "-ljasper"
+ ]
+ },
+ "mng": {
+ "label": "mng",
+ "test": {
+ "label": "MNG(header in /usr/include)",
+ "type": "compile",
+ "test": {
+ "include": [
+ "stdio.h",
+ "libmng.h"
+ ],
+ "qmake": [
+ "LIBS += -lmng"
+ ],
+ "main": [
+ "mng_handle hMNG;",
+ "mng_cleanup(&hMNG);",
+ "#if defined(MNG_VERSION_MAJOR)",
+ "#if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 &&
MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9)",
+ "#error System libmng version is less than 1.0.9",
+ "#endif",
+ "#endif",
+ "return 0;"
+ ]
+ }
+ },
+ "sources": [
+ "-lmng"
+ ]
+ },
+ "tiff": {
+ "label": "tiff",
+ "test": {
+ "label": "TIFF(header in /usr/include)",
+ "type": "compile",
+ "test": {
+ "include": "tiffio.h",
+ "qmake": [
+ "unix|mingw: LIBS += -ltiff",
+ "else:win32: LIBS += libtiff.lib"
+ ],
+ "main": [
+ "#if !defined(TIFF_VERSION) &&
defined(TIFF_VERSION_CLASSIC)",
+ "// libtiff 4.0 splits it into TIFF_VERSION_CLASSIC
and TIFF_VERSION_BIG",
+ "# define TIFF_VERSION TIFF_VERSION_CLASSIC",
+ "#endif",
+
+ "#if !defined(TIFF_VERSION)",
+ "# error \"Required libtiff not found\"",
+ "#elif TIFF_VERSION < 42",
+ "# error \"unsupported tiff version\"",
+ "#endif",
+
+ "tdata_t buffer = _TIFFmalloc(128);",
+ "_TIFFfree(buffer);",
+
+ "// some libtiff implementations where TIFF_VERSION >=
42 do not",
+ "// have TIFFReadRGBAImageOriented(), so let's check
for it",
+ "TIFFReadRGBAImageOriented(0, 0, 0, 0, 0, 0);",
+
+ "return 0;"
+ ]
+ }
+ },
+ "sources": [
+ "-ltiff"
+ ]
+ },
+ "webp": {
+ "label": "webp",
+ "test": {
+ "label": "WebP(header in /usr/include)",
+ "type": "compile",
+ "test": {
+ "include": [
+ "webp/decode.h",
+ "webp/encode.h",
+ "webp/demux.h"
+ ],
+ "qmake": [
+ "LIBS += -lwebp -lwebpdemux"
+ ],
+ "main": [
+ "#if
WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) ||
WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202)",
+ "#error \"Incompatible libwebp version\"",
+ "#endif",
+
+ "WebPDecoderConfig config;",
+ "WebPDecBuffer *output_buffer = &config.output;",
+ "WebPBitstreamFeatures *bitstream = &config.input;",
+ "WebPPicture picture;",
+ "picture.use_argb = 0;",
+ "WebPConfig config2;",
+ "config2.lossless = 0;",
+ "WebPData data = {};",
+ "WebPDemuxer *demuxer = WebPDemux(&data);",
+ "WebPIterator iter;",
+ "iter.frame_num = 0;",
+
+ "return 0;"
+ ]
+ }
+ },
+ "sources": [
+ "-lwebp -lwebpdemux"
+ ]
+ }
+ },
+
+ "features": {
+ "jasper": {
+ "label": "JasPer",
+ "disable": "input.jasper == 'no'",
+ "condition": "features.imageformatplugin && libs.jasper",
+ "output": [
+ "privateFeature",
+ { "type": "define", "negative": true, "name":
"QT_NO_IMAGEFORMAT_JASPER" }
+ ]
+ },
+ "mng": {
+ "label": "MNG",
+ "disable": "input.mng == 'no'",
+ "condition": "libs.mng",
+ "output": [ "privateFeature" ]
+ },
+ "tiff": {
+ "label": "TIFF",
+ "disable": "input.tiff == 'no'",
+ "condition": "features.imageformatplugin",
+ "output": [
+ "privateFeature"
+ ]
+ },
+ "system-tiff": {
+ "label": " Using system libtiff",
+ "disable": "input.tiff == 'qt'",
+ "enable": "input.tiff == 'system'",
+ "condition": "features.tiff && libs.tiff",
+ "output": [ "privateFeature" ]
+ },
+ "webp": {
+ "label": "WEBP",
+ "disable": "input.webp == 'no'",
+ "condition": "features.imageformatplugin",
+ "output": [
+ "privateFeature"
+ ]
+ },
+ "system-webp": {
+ "label": " Using system libwebp",
+ "disable": "input.webp == 'qt'",
+ "enable": "input.webp == 'system'",
+ "condition": "features.webp && libs.webp",
+ "output": [ "privateFeature" ]
+ }
+ },
+
+ "summary": [
+ {
+ "section": "Further Image Formats",
+ "entries": [
+ "jasper",
+ "mng",
+ "tiff", "system-tiff",
+ "webp", "system-webp"
+ ]
+ }
+ ]
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/imageformats.pro
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/imageformats.pro
---
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/imageformats.pro
2019-04-02 14:10:20.000000000 +0200
+++
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/imageformats.pro
2019-05-08 10:46:43.000000000 +0200
@@ -2,17 +2,21 @@
SUBDIRS = \
# dds \
tga \
- tiff \
- wbmp \
- webp
+ wbmp
+
+include($$OUT_PWD/../../imageformats/qtimageformats-config.pri)
+QT_FOR_CONFIG += imageformats-private
+
+qtConfig(tiff): SUBDIRS += tiff
+qtConfig(webp): SUBDIRS += webp
darwin: SUBDIRS += macheif
qtConfig(regularexpression): \
SUBDIRS += icns
-config_libmng: SUBDIRS += mng
-config_jasper {
+qtConfig(mng): SUBDIRS += mng
+qtConfig(jasper) {
SUBDIRS += jp2
} else:darwin: {
SUBDIRS += macjp2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/jp2/jp2.pro
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/jp2/jp2.pro
---
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/jp2/jp2.pro
2019-04-02 14:10:20.000000000 +0200
+++
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/jp2/jp2.pro
2019-05-08 10:46:43.000000000 +0200
@@ -5,8 +5,10 @@
qjp2handler.cpp
OTHER_FILES += jp2.json
-msvc: LIBS += libjasper.lib
-else: LIBS += -ljasper
+include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri)
+QT_FOR_CONFIG += imageformats-private
+
+QMAKE_USE_PRIVATE += jasper
PLUGIN_TYPE = imageformats
PLUGIN_CLASS_NAME = QJp2Plugin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/tiff/main.cpp
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/tiff/main.cpp
---
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/tiff/main.cpp
2019-04-02 14:10:20.000000000 +0200
+++
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/tiff/main.cpp
2019-05-08 10:46:43.000000000 +0200
@@ -42,9 +42,6 @@
#ifndef QT_NO_IMAGEFORMATPLUGIN
-#ifdef QT_NO_IMAGEFORMAT_TIFF
-#undef QT_NO_IMAGEFORMAT_TIFF
-#endif
#include "qtiffhandler_p.h"
QT_BEGIN_NAMESPACE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/tiff/qtiffhandler.cpp
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/tiff/qtiffhandler.cpp
---
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/tiff/qtiffhandler.cpp
2019-04-02 14:10:20.000000000 +0200
+++
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/tiff/qtiffhandler.cpp
2019-05-08 10:46:43.000000000 +0200
@@ -272,6 +272,8 @@
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 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 @@
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 @@
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 @@
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;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/webp/main.cpp
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/webp/main.cpp
---
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/webp/main.cpp
2019-04-02 14:10:20.000000000 +0200
+++
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/webp/main.cpp
2019-05-08 10:46:43.000000000 +0200
@@ -42,9 +42,6 @@
#ifndef QT_NO_IMAGEFORMATPLUGIN
-#ifdef QT_NO_IMAGEFORMAT_WEBP
-#undef QT_NO_IMAGEFORMAT_WEBP
-#endif
#include "qwebphandler_p.h"
#include <qiodevice.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/webp/webp.pro
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/webp/webp.pro
---
old/qtimageformats-everywhere-src-5.12.3/src/plugins/imageformats/webp/webp.pro
2019-04-02 14:10:20.000000000 +0200
+++
new/qtimageformats-everywhere-src-5.13.0/src/plugins/imageformats/webp/webp.pro
2019-05-08 10:46:43.000000000 +0200
@@ -4,9 +4,11 @@
SOURCES += main.cpp qwebphandler.cpp
OTHER_FILES += webp.json
-config_libwebp {
- unix|win32-g++*: LIBS += -lwebp -lwebpdemux
- else:win32: LIBS += libwebp.lib libwebpdemux.lib
+include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri)
+QT_FOR_CONFIG += imageformats-private
+
+qtConfig(system-webp) {
+ QMAKE_USE += webp
} else {
include($$PWD/../../../3rdparty/libwebp.pri)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtimageformats-everywhere-src-5.12.3/src/src.pro
new/qtimageformats-everywhere-src-5.13.0/src/src.pro
--- old/qtimageformats-everywhere-src-5.12.3/src/src.pro 2019-04-02
14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/src/src.pro 2019-05-08
10:46:43.000000000 +0200
@@ -1,2 +1,4 @@
TEMPLATE = subdirs
-SUBDIRS = plugins imageformats
+SUBDIRS = imageformats plugins
+
+plugins.depends = imageformats
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/tests/auto/tiff/tst_qtiff.cpp
new/qtimageformats-everywhere-src-5.13.0/tests/auto/tiff/tst_qtiff.cpp
--- old/qtimageformats-everywhere-src-5.12.3/tests/auto/tiff/tst_qtiff.cpp
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/tests/auto/tiff/tst_qtiff.cpp
2019-05-08 10:46:43.000000000 +0200
@@ -85,6 +85,7 @@
void tiled();
void readRgba64();
+ void readGray16();
private:
QString prefix;
@@ -168,6 +169,7 @@
QTest::newRow("tiled_oddsize_grayscale") <<
QString("tiled_oddsize_grayscale.tiff") << QSize(59, 71);
QTest::newRow("tiled_oddsize_mono") << QString("tiled_oddsize_mono.tiff")
<< QSize(59, 71);
QTest::newRow("16bpc") << QString("16bpc.tiff") << QSize(64, 46);
+ QTest::newRow("gray16") << QString("gray16.tiff") << QSize(64, 46);
}
void tst_qtiff::readImage()
@@ -178,9 +180,13 @@
QString path = prefix + fileName;
QImageReader reader(path);
QVERIFY(reader.canRead());
+ QImage::Format headerFormat = reader.imageFormat();
+ QSize headerSize = reader.size();
QImage image = reader.read();
QVERIFY(!image.isNull());
QCOMPARE(image.size(), size);
+ QCOMPARE(image.size(), headerSize);
+ QCOMPARE(image.format(), headerFormat);
}
void tst_qtiff::readCorruptImage_data()
@@ -386,7 +392,8 @@
QTest::newRow("tiff indexed") << QImage::Format_Indexed8 <<
QImage::Format_Indexed8 << QImageIOHandler::TransformationMirror;
QTest::newRow("tiff argb32pm") << QImage::Format_ARGB32_Premultiplied <<
QImage::Format_ARGB32_Premultiplied << QImageIOHandler::TransformationRotate90;
QTest::newRow("tiff rgb32") << QImage::Format_RGB32 <<
QImage::Format_RGB32 << QImageIOHandler::TransformationRotate270;
- QTest::newRow("tiff grayscale") << QImage::Format_Grayscale8 <<
QImage::Format_Grayscale8 << QImageIOHandler::TransformationFlip;
+ QTest::newRow("tiff grayscale8") << QImage::Format_Grayscale8 <<
QImage::Format_Grayscale8 << QImageIOHandler::TransformationFlip;
+ QTest::newRow("tiff grayscale16") << QImage::Format_Grayscale16 <<
QImage::Format_Grayscale16 << QImageIOHandler::TransformationMirror;
QTest::newRow("tiff rgb64") << QImage::Format_RGBX64 <<
QImage::Format_RGBX64 << QImageIOHandler::TransformationNone;
QTest::newRow("tiff rgba64") << QImage::Format_RGBA64 <<
QImage::Format_RGBA64 << QImageIOHandler::TransformationRotate90;
QTest::newRow("tiff rgba64pm") << QImage::Format_RGBA64_Premultiplied <<
QImage::Format_RGBA64_Premultiplied << QImageIOHandler::TransformationNone;
@@ -609,5 +616,16 @@
QCOMPARE(image.format(), QImage::Format_RGBX64);
}
+void tst_qtiff::readGray16()
+{
+ QString path = prefix + QString("gray16.tiff");
+ QImageReader reader(path);
+ QVERIFY(reader.canRead());
+ QCOMPARE(reader.imageFormat(), QImage::Format_Grayscale16);
+ QImage image = reader.read();
+ QVERIFY(!image.isNull());
+ QCOMPARE(image.format(), QImage::Format_Grayscale16);
+}
+
QTEST_MAIN(tst_qtiff)
#include "tst_qtiff.moc"
Binary files
old/qtimageformats-everywhere-src-5.12.3/tests/shared/images/tiff/gray16.tiff
and
new/qtimageformats-everywhere-src-5.13.0/tests/shared/images/tiff/gray16.tiff
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtimageformats-everywhere-src-5.12.3/tests/shared/images/tiff.qrc
new/qtimageformats-everywhere-src-5.13.0/tests/shared/images/tiff.qrc
--- old/qtimageformats-everywhere-src-5.12.3/tests/shared/images/tiff.qrc
2019-04-02 14:10:20.000000000 +0200
+++ new/qtimageformats-everywhere-src-5.13.0/tests/shared/images/tiff.qrc
2019-05-08 10:46:43.000000000 +0200
@@ -51,5 +51,6 @@
<file>tiff/tiled_oddsize_mono.tiff</file>
<file>tiff/oddsize_mono.tiff</file>
<file>tiff/tiled_rgb.tiff</file>
+ <file>tiff/gray16.tiff</file>
</qresource>
</RCC>
