summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionv5.12.125.12Jani Heikkinen2021-10-041-1/+1
| | | | Change-Id: I68a4a9b787be7735bca5a5165d477de817040065
* Patch bundled libtiff to compile on IntegrityEirik Aavitsland2021-06-151-6/+10
| | | | | | | | | More recent versions of the compiler works, but for Qt 5.x we support an older version that fails to compile this code. (cherry picked from 5.15 commit) Change-Id: If073e07929eb330766b49087d49531409a7548e5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* Update bundled libtiff to version 4.3.0Eirik Aavitsland2021-06-1573-5932/+7677
| | | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.3.0 Change-Id: I4be8884394db6de7a2aedd4c41abc49a1e565917 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 2d8573f44106bda16466c210d32cc867d2bea227) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Avoid scanline overflow when reading corrupt tiffsv5.12.11Eirik Aavitsland2021-03-031-0/+4
| | | | | | | | | | | | | Check that the actual scanlines to be read by libtiff are not wider than expected. This issue was reported by Samuel Groß and Natalie Silvanovich of Google Project Zero. Change-Id: I2af818d5a3c57643747a7fbfac8bb934cd79efd7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 124d950b34a4b5f3bc7f1fa34336f882dbc3edc5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libtiff to version 4.2.0Eirik Aavitsland2021-03-0140-303/+3088
| | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.2.0 Change-Id: I376c88638ede59fa4fe316c1468035564218a334 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 879601802798ac253a68e91bcd78d9c2e3f24011) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid oob access when reading certain corrupt tiled tiffsEirik Aavitsland2021-02-241-3/+8
| | | | | | | | | | | | | | Add check against corrupt tiffs where libtiff can report conflicting values of tile width, length and byte size. This issue was reported by Samuel Groß and Natalie Silvanovich of Google Project Zero. Change-Id: Icb9c20317746190c446c93b474f5c490a805551c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 0709cda6fa836ac222a06062abc3fd3ac0730c12) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* fix build on Arch LinuxEvgeniy A. Dushistov2020-11-241-0/+1
| | | | | | | | | | qtimageformats/src/plugins/imageformats/jp2/qjp2handler.cpp:844:41: error: no declaration of «pow» 844 | const double jasperRate = minRate + pow((double(quality) / double(maxQuality)), 2) * maxRate; Change-Id: I085996c2db2251903b2a3e52e6e648831637c8f9 (cherry picked from commit 704868db61be1542c2d9e2b75ead00c45c56cc36) Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Bump versionJani Heikkinen2020-11-061-1/+1
| | | | Change-Id: I9c3e739a9f6a0705cb9dfb65d99d99a18b78fe99
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+24
| | | | | | | Change-Id: I2defeff2a79b1e69343bf2f13cc5cdb304982452 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 7518d381be0f58f943bd8bead901356d2528e26b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-141-1/+1
| | | | Change-Id: I9bade39a9a9d9ca99e1fe9e81612aeb7fa76ac22
* Merge remote-tracking branch 'origin/5.12.9' into 5.12Qt Forward Merge Bot2020-06-171-0/+20
|\ | | | | | | Change-Id: If95ca252da6fbec55d5a64fc32e78ff8141a0078
| * Add changes file for Qt 5.12.9v5.12.9Antti Kokko2020-06-041-0/+20
|/ | | | | | | + b51c3e5a5ddc1d10c651a11c99b121b2b2b10265 Bump version Change-Id: Ib1d132513d14070160db6a61585011f5171e10ae Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-04-221-1/+1
| | | | Change-Id: Ic2e53fe0b13c424dc8af121ad84f552a05e2294d
* Merge remote-tracking branch 'origin/5.12.8' into 5.12Qt Forward Merge Bot2020-04-141-0/+20
|\ | | | | | | Change-Id: I5f11ee76dfd13243de8124c27f3df03c809abec5
| * Add changes file for Qt 5.12.8v5.12.8Antti Kokko2020-03-171-0/+20
|/ | | | | | | | + ee52ef26a530f5a6382b25caadea698ab13bafc7 Bump version + 6e7fe099f41068aa75fe01e52f1496dfdc12ed79 tiff: do not try to read 32bpc as 16bpc Change-Id: I82d4b94978eb8075962d919c4f14fb6d77e7615a Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* tiff: do not try to read 32bpc as 16bpcEirik Aavitsland2020-03-121-2/+2
| | | | | | | | | | The header reader would assume that bits per sample above 8 had to be 16, but other values are also possible, so check explicitly. Fixes: QTBUG-82412 Change-Id: I7f0799de4d4cdc84023a34900aa595a7bf73eca1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 0c4d4dc12a68124451113e21d2c4fdc5d06d01d0)
* Merge remote-tracking branch 'origin/5.12.7' into 5.12Qt Forward Merge Bot2020-01-311-0/+20
|\ | | | | | | Change-Id: I90fcfdbe7e1a2f57164ff9b13d289b907ffc0020
| * Add changes file for Qt 5.12.7v5.12.7Antti Kokko2020-01-171-0/+20
| | | | | | | | | | | | | | + e94a9f2badc82f9b8aba094cf7d73fe7f86c3ee1 Bump version Change-Id: Ie3a53cdef5c60f295c15de4240ad2d1426a51257 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Bump versionAlexandru Croitor2020-01-281-1/+1
|/
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-071-0/+24
|\ | | | | | | Change-Id: I859151ba9b42a579c57cc03997fbcb632802d754
| * Update changes file for 5.12.6v5.12.6Eirik Aavitsland2019-11-071-3/+2
| | | | | | | | | | Change-Id: I781f76b8b57445cade3a19a510cc99e9d0b59e94 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Merge 5.12 into 5.12.6Kari Oikarinen2019-11-0731-712/+2630
| |\ | | | | | | | | | Change-Id: Icfbebe5c86f6c8958f1fc60f98a034d9e338e076
| * | Add changes file for Qt 5.12.6Antti Kokko2019-11-051-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | + 2378a4b6228907e8428f613d2e625601550bfe21 Tiff: Include two upstream CVE fixes in bundled libtiff + b722026bd89c2c0e5688131a257a5c24e70a16ed Bump version Change-Id: Icce928844b6f4385ec88c13072e55b6fa56def10 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Bump versionFrederik Gladhorn2019-11-071-1/+1
| |/ |/|
* | Update bundled libtiff to version 4.1.0Eirik Aavitsland2019-11-0631-712/+2630
|/ | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.1.0 Change-Id: I3e841863c5cf8588bf62b6520f34e64909394998 (cherry picked from commit ba1fb21bc61a2075c7fd058e7f7ba5caf7d2f400) Reviewed-by: Liang Qi <liang.qi@qt.io>
* Bump versionFrederik Gladhorn2019-10-301-1/+1
|
* Tiff: Include two upstream CVE fixes in bundled libtiffEirik Aavitsland2019-10-308-112/+91
| | | | | | | | | | | | | | | | | | | 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) (cherry picked from commit 9fe1f2e918d39031852805f1add23125c061d3c3) Change-Id: Ia98d381bb677fcd167724895515eb3fdecee9709 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* 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>
* 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>
* 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>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: Ide8cae87ec1c714b818d7c82cd481f52570a733d
* 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
* 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.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>
* | 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>
* | 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>
* | 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>
* 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>
* tiff handler: fix compilation failureEirik Aavitsland2019-03-251-1/+1
| | | | | | | | | 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>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I6ed160d21aa58a73af959da17e9db7284eb67ad4
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+24
|\ | | | | | | Change-Id: Ie6a8107de26d129e4d93471d7ca6e6180ba4301a
| * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-251-0/+24
|/ | | | | | | | + 50f6698117c2259bdd78868620908eec79e09561 Bump version + 0e8422bedc8c84ff7c08c6b3163329e82c2007dd Update bundled libwebp to version 1.0.2 Change-Id: I32217b3cc2336c930278af3be8d95dda85ed5f88 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Update bundled libwebp to version 1.0.2André Klitzing2019-02-0421-165/+530
| | | | | | | | [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>