summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update bundled libtiff to version 4.1.05.13Eirik Aavitsland2019-11-0631-712/+2630
| | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.1.0 Change-Id: I3e841863c5cf8588bf62b6520f34e64909394998 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Tiff: Include two upstream CVE fixes in bundled libtiffv5.13.2Eirik Aavitsland2019-10-239-113/+97
| | | | | | | | | | | | | | | | | | | | For issues CVE-2019-17546 and CVE-2019-14973, the following commits were merged into the bundled libtiff: 4bb584a35f87af42d6cf09d15e9ce8909a839145 RGBA interface: fix integer overflow potentially causing write heap buffer overflow, especially on 32 bit builds. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16443. Credit to OSS Fuzz 1b5e3b6a23827c33acf19ad50ce5ce78f12b3773 Fix integer overflow in _TIFFCheckMalloc() and other implementation-defined behaviour (CVE-2019-14973) Fixes: QTBUG-79397 Change-Id: I29257e6dbfbd816224d3dbaefdbe8afecd25f288 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add changes file for Qt 5.13.2Antti Kokko2019-10-141-0/+20
| | | | | | | | | + f8b773d1d4b2f153eb97578ba5e49fd43564f7fb Do not try to write too large WebP images + 53f8fd57b698b97aded363700306fe61c4b9ea17 Add changes file for Qt 5.12.5 + ab09c9dd9a93932feedbc99e9e965be5bc852c02 Tiff handler: Improve writing performance for some cases Change-Id: I9c1d6ea8ee0de06edf1ee2924da5c3e6e9bde76c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | Change-Id: If02646dde21f8350ff51cccfbc3ce4637ad49724
* Tiff handler: Improve writing performance for some casesEirik Aavitsland2019-10-091-20/+8
| | | | | | | | | | | | For 1 byte deep formats, the writing routine went through the copy-and-convert-in-chunks loop for no reason: no conversion was done or needed. For huge images of some formats, the chunk size computation could fail because of int overflow, resulting in suboptimal chunk sizes. Change-Id: I966351d9a8728987c9e885f4949d98ba94d4ac19 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+24
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+24
|/| | | | | | | Change-Id: I001799846ca4c7c63838f1212ce18d2d00573182
| * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+24
| |\
| | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+24
| |/| | | | | | | | | | Change-Id: I0d8316ac3fe4db44042d3b8be90bb04deb9bcd70
| | * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+24
| |/ | | | | | | | | | | | | | | | | + 7bdf0823b64e53a90f7a54151afada3aaceb7ba1 Bump version + d4861c2a836f323e1c4694bf7830e69ef845b8ce Update bundled libwebp to version 1.0.3 + 9100cc7ab04586890fb8f1924b0e06ad3efa7d3e Reapply: Fix building with clang_cl Change-Id: Ia9b554003c3925ae570e23eff37d2ab06e4925c5 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+24
|\ \
| * | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+24
|/| | | | | | | | | | | Change-Id: I1ecf15edfe9e73e63c014b654a1f56e00a69fb14
| * | Merge 5.13 into 5.13.1v5.13.1Paul Wicking2019-08-061-3/+3
| |\ \ | | | | | | | | | | | | Change-Id: I569b9f05bdc70563107c0cd9c9a12812fbd52198
| * | | Add changes file for Qt 5.13.1Antti Kokko2019-07-311-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 626c3053efd7905080ac4a65fca55551391a36e3 Fix feature and library checks for tiff and mng + 311a521df449554a24555d3603cef365550ea254 Bump version + 43ca053b50d7ed663c6734879070186bf28a0d29 Add changes file for Qt 5.12.4 + d2c5409c1a4994052fd0c470148f1cd38f908d1c Bump version + 7bdf0823b64e53a90f7a54151afada3aaceb7ba1 Bump version + 7ad0ef0f31afd89509dc2cb3c102b22c0e6c725c Fix compilation with disabled deprecated APIs + 2e1d4d9bf2804c842feeafefb7b42051417b68ab Doc: Replace example file lists with links to code.qt.io + d4861c2a836f323e1c4694bf7830e69ef845b8ce Update bundled libwebp to version 1.0.3 Change-Id: I4fe29b52bfcdcc1525f29b934240b7c991de83e6 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | | Do not try to write too large WebP imagesAllan Sandfeld Jensen2019-08-171-0/+4
| |/ / |/| | | | | | | | | | | | | | | | | The WebP encoder doesn't check so we end up with undefined behavior. Change-Id: Id3a64b2be50684d07e799f97f64481ba57c02ffb Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-031-3/+3
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-031-3/+3
|/| | | |/ | | | | Change-Id: If594ae6ab8040f90e5ebe754854b412073b734ec
| * Reapply: Fix building with clang_clAllan Sandfeld Jensen2019-07-311-3/+3
| | | | | | | | | | | | | | | | This fix was mistakenly overwritten by the recent 1.0.3 upgrade. Change-Id: Ifcfeeac075d97d770de471380c506fb739f0b52a (cherry picked from commit dbfcea2a638d9223bb8d4d9ffc63b0d294b9f97d) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-2346-346/+532
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-2346-346/+532
|/| | | |/ | | | | Change-Id: I88bbc7ca2384e7fcafeacf72d0b9a74b9c1cc43e
| * Update bundled libwebp to version 1.0.3André Klitzing2019-07-2246-346/+532
| | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.3 Change-Id: I7aef89e209923af0e516024c26ebce4a8158d4d1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idf9f3c89095eb042ce5acf6c2b03fec6b7bbde70
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: Ide8cae87ec1c714b818d7c82cd481f52570a733d
* | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
|/ / | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I1cbe0e8a7ba8c7c53e16747c8a48d8bdf2b2bebf Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Fix compilation with disabled deprecated APIsSona Kurazyan2019-07-0812-0/+24
| | | | | | | | | | | | | | | | | | | | The QImageIOHandler::name() has been deprecated since 5.13, but its overrides weren't. Enabled compilation of the overrides only when the QImageIOHandler::name() is compiled. Task-number: QTBUG-76491 Change-Id: I913f03f730969ea88864a5a08afe50c4eac533ca Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: I03fcc6c395a5eb007bc17c0a47d55e3941b48ffe
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+28
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+28
|/| | | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I468a913d74687b6dae4b5f01873dc9fd77ac9866
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+29
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+29
| |/| | | | | | | | | | Change-Id: I2257338a1b5fe8d069ac51011a1de5e26e02611c
| | * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-241-0/+28
| | | | | | | | | | | | | | | Change-Id: I6f3f2b3c3a231ac661c0f5e9d5feeb6f7e09f2de Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| |/ | | | | | | Change-Id: I3db405cb4a9a524b8343a5cf5c11b615b9bcb1a9
* | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+31
|\ \
| * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+31
|/| | | | | | | | | | | Change-Id: Ice21bedefc4172c1e3587033c9dae35e325e6e08
| * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-081-0/+31
| | | | | | | | | | | | | | | Change-Id: I7f65c3edcc9499e4992994454071f50f53c0f6ff Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-142-5/+9
|\ \ \ | |/ / |/| / | |/ Change-Id: Ia0a5fe32ec96c73758933b319f5cb8f22cc9f344
| * Fix feature and library checks for tiff and mngJoerg Bornemann2019-05-132-5/+9
| | | | | | | | | | | | | | This amends commit a33e3aea. Change-Id: I03304f5bf300e5e52476c3f3d6b06b0815009720 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-231-0/+31
|\| | | | | | | Change-Id: Ibad0ab94f0b2ed9bc3182fde979347aeeaf0235b
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+31
| |\ | | | | | | | | | Change-Id: I266e94316aa280198572a718ea8bd6157a56ba2e
| | * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-021-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | + 4b0d658f47ec80e3d7a5b66c060efe9a9ef5289a Bump version + 0989f6aa2d45426c10bcfd60272486a8b34c8e44 tiff handler: fix compilation failure + 434aa248ad5710c7f65283fc3beb7e8adb8b1ad7 Heic handler: fix orientation and other image properties Change-Id: Icaffd1c0351fa5e816f93c79da1de55ea7f577e5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3Qt Forward Merge Bot2019-04-161-0/+1
|\| | | | | | | | | | | Change-Id: I8ad02040bdd3ce055c48c761b08f9ac1f742a6fa
| * | Fix -no-gui buildJoerg Bornemann2019-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: I57639389880e5c73025ffe3db9f411fc5b0e78e8 Fixes: QTBUG-75113 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-04-093-10/+2
|\| | | | | | | | | | | Change-Id: I02bc865209f0092c68e5be1542f54e605c517c58
| * | Remove the QT_NO_IMAGEFORMAT_{TIFF|WEBP} definesJoerg Bornemann2019-04-023-10/+2
| | | | | | | | | | | | | | | | | | | | | They are #undef'ed anyway. Change-Id: Ic1cb3c09b5849f16115d8514fef471825d564f2c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-0217-232/+247
|\| | | | | | | | | | | Change-Id: Idd134e350e760a0237dce4ef00d10e1c35dbeb67
| * | Move qtimageformats over to the new config systemLiang Qi2019-04-0216-229/+244
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-44318 Task-number: QTBUG-62259 Change-Id: Ide5c28015c46b12ee3f21d06badd69db8bed1281 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Fix building with clang_clAllan Sandfeld Jensen2019-04-011-3/+3
| |/ | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-278-50/+288
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie44fe655653166bf5a4436aedd80d060afa45d5a
| * Heic handler: fix orientation and other image propertiesEirik Aavitsland2019-03-267-49/+287
| | | | | | | | | | | | | | | | | | | | 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>