Commit Graph

395 Commits

Author SHA1 Message Date
Liang Qi a33e3aeac7 Move qtimageformats over to the new config system
Task-number: QTBUG-44318
Task-number: QTBUG-62259
Change-Id: Ide5c28015c46b12ee3f21d06badd69db8bed1281
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2019-04-02 09:15:40 +00:00
Allan Sandfeld Jensen dbfcea2a63 Fix building with clang_cl
Clang reports itself as MSVC but doesn't allow intrinsics to be used
unconditionally independent of command-line flags like MSVC does.

Fixes: QTBUG-68551
Change-Id: I65d1ee1aa5c02b7c3a25c10c69c3d5e88129b858
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2019-04-01 08:44:15 +00:00
Eirik Aavitsland 434aa248ad Heic handler: fix orientation and other image properties
The mac heic handler lacked support for any meta-data i/o. Most
notably, the image orientation proprty was ignored, so images read in
could be wrongly oriented.

Fixes: QTBUG-73415
Change-Id: I779f91dc28c7441b124aab4557e1abcd3e69fde9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2019-03-26 12:48:59 +00:00
Eirik Aavitsland 0989f6aa2d tiff handler: fix compilation failure
Avoid using the tmsize_t type, since it may not be defined.

Fixes: QTBUG-74283
Change-Id: I63a496173ec08c6ceac569c516d11a4711e32649
Reviewed-by: Richard Öhlinger <richard.oehlinger@adbsafegate.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2019-03-25 12:01:07 +00:00
Kari Oikarinen 4b0d658f47 Bump version
Change-Id: I6ed160d21aa58a73af959da17e9db7284eb67ad4
2019-03-21 09:08:43 +02:00
Qt Forward Merge Bot d83c22120c Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: Ie6a8107de26d129e4d93471d7ca6e6180ba4301a
2019-03-15 11:06:39 +01:00
Antti Kokko 1b8478f86f Add changes file for Qt 5.12.2
+ 50f6698117 Bump version
+ 0e8422bedc Update bundled libwebp to version 1.0.2

Change-Id: I32217b3cc2336c930278af3be8d95dda85ed5f88
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2019-02-25 09:38:12 +00:00
André Klitzing 0e8422bedc Update bundled libwebp to version 1.0.2
[ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.2

Change-Id: I12e1557cef6e592c8c2ca417ef87f6df35a7b410
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-04 09:17:27 +00:00
Qt Forward Merge Bot 9cc84d6cd6 Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: I29bc61b996eac4cb7e0e3cddee2384b4e7fe4238
2019-02-01 11:47:00 +01:00
Kari Oikarinen 50f6698117 Bump version
Change-Id: Ibd92992bbf1cc5ab6ddfe10872838b47a970645e
2019-01-14 09:13:50 +02:00
Antti Kokko 3987e304df Add changes file for Qt 5.12.1
+ 2f61f40118 Bump version
+ 0c8d172cf3 Update bundled libwebp to version 1.0.1
+ 43403038cf Update bundled libtiff to version 4.0.10
+ 335dc6af7d Add changes file for Qt 5.11.3
+ cbdabc6a23 Bump version

Change-Id: I825bca621f36828296be9fab4bab4123aec59747
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2019-01-09 18:48:39 +00:00
Kari Oikarinen cbdabc6a23 Bump version
Change-Id: I0b0ad828fc464b89844636ab34ce6a30f6457367
2019-01-07 09:29:26 +02:00
Qt Forward Merge Bot 178b8572d7 Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Ib84ba922bb21f9e6c52c3096e7ae0fc10025c202
2018-12-11 10:19:31 +01:00
Qt Forward Merge Bot 7abea3cc2d Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: If23873da11d13d8309efe25240269f9d11889ee3
2018-12-05 09:17:17 +01:00
Qt Forward Merge Bot 904aa93187 Merge remote-tracking branch 'origin/5.11.3' into 5.11
Change-Id: I5ef5083941390a0b9d9fe59b63a744e5a1aecf18
2018-12-04 09:41:08 +01:00
Antti Kokko 335dc6af7d Add changes file for Qt 5.11.3
+ 43403038cf Update bundled libtiff to version 4.0.10
+ 0c8d172cf3 Update bundled libwebp to version 1.0.1
+ 7cfe47a8fe TGA handler: check for out of range image size
+ 80017a1c7f Bundled libtiff: add a number of security-related upstream patches
+ 8455ab6cb2 tiffhandler: improve stripsize
+ 2f61f40118 Bump version

Change-Id: If31999c0f727ce8b73e5ffb35e247d1106011bb9
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2018-11-24 16:46:59 +00:00
Eirik Aavitsland 43403038cf Update bundled libtiff to version 4.0.10
[ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.10

Change-Id: Ib1908d09fc5847381cb03418de878fafd2001a30
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-19 12:34:27 +00:00
André Klitzing 0c8d172cf3 Update bundled libwebp to version 1.0.1
[ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.1

Change-Id: Ieccb9f7c0023e6f6591b6093eead9f6940be3210
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2018-11-19 12:34:21 +00:00
Qt Forward Merge Bot c522f9d430 Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
	.qmake.conf

Change-Id: I0817b4aa191d2523f65242043ca547a20d020f75
2018-11-16 13:24:48 +01:00
Oswald Buddenhagen 2f61f40118 Bump version
Change-Id: I4c7777870ba33b26f3808eb3211b795138e6f74f
2018-11-08 11:27:22 +01:00
Antti Kokko 8bd2d545fd Add changes file for Qt 5.12.0
Change-Id: I016e1d4158385e185248802699f9e04721e9e10a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-31 15:37:19 +00:00
Qt Forward Merge Bot a9be081dac Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I56fb4e7a178ac79c75a846d9a7bcd8f1f3533673
2018-10-27 03:01:54 +02:00
Eirik Aavitsland 8455ab6cb2 tiffhandler: improve stripsize
libtiff's default stripsize is tiny (8KB), so splitting the image into
such strips on writing would significantly hurt the compression
rate. Aim for 4MB strips instead.

Task-number: QTBUG-70820
Change-Id: I07a9a8c81edf62e802b4ae8d6729a76df15e42ac
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-10-25 12:19:14 +00:00
Eirik Aavitsland 4783c6dc44 Remove bundled, unmaintained libjasper source code
[ChangeLog][Third-Party Code] The unmaintained bundled libjasper has been
removed. Building the jp2 handler will require libjasper to be present as
a system or external library.

Change-Id: Ic48cc6021fc5fb64fb369eb9621fd7a811e8e9f7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2018-10-15 07:18:33 +00:00
Qt Forward Merge Bot 5f1bcf8692 Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: If9cf53dac5e906350e652e52842f3b54bc3fe65f
2018-10-13 03:04:12 +02:00
Eirik Aavitsland 3e081dbc87 Remove bundled, unmaintained libmng source code
[ChangeLog][Third-Party Code] The unmaintained bundled libmng has been
removed. Building the mng handler will require libmng to be present as
a system or external library.

Change-Id: I4a4805fa3f3088b5d581b92bfeabba7978bac5f7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2018-10-12 13:17:11 +00:00
Eirik Aavitsland 80017a1c7f Bundled libtiff: add a number of security-related upstream patches
This comprises the following libtiff commits, related to the listed
CVEs:
3719385a3fac5cfb20b487619a5f08abbf967cf8 CVE-2017-11613
7a092f8af2568d61993a8cc2e7a35a998d7d37be CVE-2017-11613
de144fd228e4be8aa484c3caf3d814b6fa88c6d9 CVE-2018-10963
58a898cb4459055bb488ca815c23b880c242a27d CVE-2018-8905
981e43ecae83935625c86c9118c0778c942c7048 CVE-2018-10779

[ChangeLog][TIFF] A number of security-related upstream patches has
been applied to the bundled libtiff

Change-Id: I3def9a9b91d0dd2cfd959c5e83d972beed9394d6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-12 07:51:09 +00:00
Eirik Aavitsland ceebd297c3 tiff handler: ensure valid value of the compression option
Bound the value of the compression setting to the possible values of
the QTiffHandler::Compression enum.

Change-Id: I50e1eb8014654d8b4403d7f06e6099661e57562c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-09-17 12:42:35 +00:00
Qt Forward Merge Bot c2cb9d2866 Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iecd1afcf29ff40333e809a953f8807180c81ef78
2018-09-11 03:00:05 +02:00
Qt Forward Merge Bot 855106d172 Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: Ia939d042682fefbf7774352ebce4b07efa5bb45e
2018-09-09 12:12:42 +02:00
Qt Forward Merge Bot dd38f75d86 Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I04f8b27d37b677f15853ba84017d3f2a36368422
2018-09-01 03:01:55 +02:00
Antti Kokko 529f5854c1 Add changes file for Qt 5.11.2
Change-Id: Id37f327e4b404e20b50ceabcd754b2a61089c793
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2018-08-31 06:29:04 +00:00
Eirik Aavitsland 6eefe6d0c6 TGA handler: check for out of range image size
Make the decoder fail early to avoid spending time and memory on
attempting to decode a corrupt image file.

Change-Id: Iac35e72de743f412a65d11c58fe7faa275dc4e41
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 7cfe47a8fe)
2018-08-29 10:50:03 +00:00
Eirik Aavitsland 7cfe47a8fe TGA handler: check for out of range image size
Make the decoder fail early to avoid spending time and memory on
attempting to decode a corrupt image file.

Change-Id: Iac35e72de743f412a65d11c58fe7faa275dc4e41
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-08-28 10:56:09 +00:00
Allan Sandfeld Jensen 2842212e88 Add RGBA64 format support to TIFF plugin
TIFF is one of the primary formats for HDR images.

Change-Id: I5310b5c9a625fd3e759e5120be6ba547c633c81c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2018-08-23 11:54:53 +00:00
Qt Forward Merge Bot 6a039e4e77 Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	.qmake.conf

Change-Id: Ie5dd492beacabe7e31b28e225c72b939d6ac0e41
2018-07-31 10:37:45 +02:00
Oswald Buddenhagen 55904e9671 Bump version
Change-Id: If97b37e0b55b7118923429d02ff639487efa2a9b
2018-07-30 18:45:51 +02:00
Qt Forward Merge Bot b0d2ba210b Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I58dba163ebbf4058060918ae63da1cb0361325d1
2018-06-23 03:00:22 +02:00
Qt Forward Merge Bot 177c85c58d Merge remote-tracking branch 'origin/5.11.1' into 5.11
Change-Id: I2ce9a0ad2904663c6a629ead8041ca61b1eab465
2018-06-19 13:18:18 +02:00
Qt Forward Merge Bot 649100fa0e Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ieebdb63bc396bb683b85e3d07ec9c5d78bd30f69
2018-06-12 03:01:23 +02:00
Antti Kokko e945d172fe Add changes file for Qt 5.11.1
Change-Id: Iff4c339719bb389db78f558aded1be3baec292d4
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2018-06-09 11:12:34 +00:00
Antti Kokko 8a309a90a3 Add changes file for Qt 5.9.5
Change-Id: Iee64c43bdbc7f729ece4f2c6981e130dd80c2010
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit 0267be9dac)
2018-06-06 12:17:18 +00:00
Antti Kokko fe76a7be10 Add changes file for Qt 5.9.6
Change-Id: I8a944434fc17b6c422cce7eb80f950c10aa98873
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit e9daef6d8f)
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2018-06-06 12:17:16 +00:00
Eirik Aavitsland 254bcd4793 Fix tiffhandler: ensure saved tiffs have suitable ROWSPERSTRIP tag set
When writing an image without compression, libtiff will automatically
store it in strips of default size, and add a ROWSPERSTRIP tag
accordingly. However, if compression is enabled, libtiff does not do
this. The lack of this tag may create trouble for readers.
Fix by explicitly setting the tag in all cases.

[ChangeLog][TIFF] Ensure saved tiffs have suitable ROWSPERSTRIP tag set

Task-number: QTBUG-68609
Change-Id: I838c83be25158d7f13e220098e960010b8cb2789
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-06-06 07:22:21 +00:00
Qt Forward Merge Bot d589752450 Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	.qmake.conf

Change-Id: I3f4cd43e459509af88cfc49d8bcaa8fe36167bb1
2018-06-04 16:10:53 +02:00
Oswald Buddenhagen 470e683fe3 Bump version
Change-Id: Id6d4d759a40e01d9ee453d1eb25a81e7e93e8c21
2018-05-31 14:04:15 +02:00
Edward Welbourne de0b8954d0 Remove LGPL_EXCEPTION.txt
It became obsolete when we switched to LGPL3, as discussed on the
developer mailing list in April 2017.

Change-Id: I7364ce547f952380d8b8e32b89c09b6ace3c9188
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-05-31 05:58:41 +00:00
Eirik Aavitsland 9749e824a5 webp handler: improve quality-level handling
In lossless mode, libwebp interpretes the quality setting as a
compression-effort setting instead. The code used to set it to 100
(maximum), which could lead to unreasonable compression times (several
seconds for a small image). Instead set it to libweb's own default value.

Also, since the alpha channel compression has its own quality setting,
make sure it follows the main quality/effort setting.

Change-Id: I595d42c61f61c9932b27b185745bde6e7cfb3526
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-30 07:35:48 +00:00
Eirik Aavitsland b9ba221756 webp handler: support alpha-less reading and writing
Webp files can be with or without alpha channel. The handler would
ignore this and read all as Format_ARGB32 images, and write all as
having alpha, in both cases losing that important bit of information.

As a driveby, simplify the endianness handling in write(). By always
converting the source image to an endianness-independent QImage
format, no special handling is required.

Task-number: QTBUG-48628
Change-Id: I624ed72b18a8b59a542979efcb4e8ff81214e0d7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-28 11:15:48 +00:00
Qt Forward Merge Bot aa33202648 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I06492f609fbb58d78738fff6d124b616287b03bd
2018-05-26 03:01:00 +02:00