summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgpl5.15Tarja Sundqvist2024-01-04120-36484/+42137
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I61d561ccb0fe4d1f669a97acb27e76f646b76731
| * Update bundled libtiff to version 4.5.0Eirik Aavitsland2023-01-1867-36210/+41570
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.5.0 Fixes: QTBUG-109972 Change-Id: I2121b68c5a09ca322b3af0f971d710ae392c539c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit da0158c0d36973e56fc7c364383bb5ebba4bb3e7) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Update bundled libwebp to version 1.3.0Eirik Aavitsland2023-01-1650-268/+529
| | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.3.0 Change-Id: Ib7645b7348e950bfa27b902de6da879f8309408d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 3cba6d10543c508e2c2f8b942dad9147c0d1ea0d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Implement support for file memory mapping for tiff readingEirik Aavitsland2023-01-161-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libtiff will by default attempt to establish a memory map for reading a tiff file. Implement the callbacks to establish this in Qt's tiff handler, since this will save data copying, particularly in the case where the input file is already in memory as a resource or QBuffer. Also, this makes sure that QTiffHandler utilizes libtiff's default, and hence best tested, code path for tiff decoding. Specifically, it avoids a hitting a bug that breaks reading of certain tiffs in the newly released libtiff version 4.5.0. Change-Id: Id6a746546e069da9910cacd4a4996c669c72cbab Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit cd92d76e9dcd98f4fc974c796453459779393bdc) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * TGA Plugin: Fix reading of CMapDepthRobert Löhning2023-01-091-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's specified to be one byte but the old code used to read an int of two bytes. Maybe this wasn't noticed because the following byte often has a value of zero. This fixes oss-fuzz issue 50741 which is an integer overflow resulting from the too large value. [ChangeLog] Fixed reading of TGA files with a non-zero X-origin Change-Id: I989bffd0e4e03caf6737e1ce085247ed54e40db0 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Robert Löhning <robert.loehning@qt.io> (cherry picked from commit feb7864054886bfb8a99d0f8e3a06ae120f97e62) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: Iafcc112822744687899a0de9bb5f0e96f1e65612 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-113-1/+4
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I304f4e4e7800cb47a601d51a7921c9502940066e
| * Reject tiled tiffs with corrupt tile size earlyEirik Aavitsland2022-10-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | Work around a shortcoming in libtiff where it spends time discovering the corruption. Fixes: QTBUG-107223 Change-Id: Ib5da260fe971d0f7d808f7215bf388c443318cb4 Reviewed-by: Robert Löhning <robert.loehning@qt.io> (cherry picked from commit 4f83c3ebfdb2bc97162ac1065091c195b60ff5fb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: I2567d174e05fdbdfa4c98bac6bec51f22edbe75c
| * Fix bundled libtiff compilation lzw warning and reading failureEirik Aavitsland2022-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lacking #include of stdlib.h leads to a compilation warning and runtime reading failure on some platforms. Observed on MSVC2019 in debug mode. Fix by applying commit cbd71793f58c0eda8128f799d415c56e5c64eaa5 in the upstream libtiff repo. Fixes: QTBUG-107040 Change-Id: Ic76c4627632302423d0e0f8f1b51df342e62b420 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit 64e455da1c05a9fafe7125690053fb951268a733) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-0988-4403/+7943
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I1ef7b4328096b0adb6abc46471100b5779504d05
| * Update bundled libwebp to version 1.2.4Eirik Aavitsland2022-08-2252-1570/+2660
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.2.4 Change-Id: Ibd50e3ee67dbe0f7c385224cd9e07df75ea838b9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 91c2c3832d1853c737998a1277957d487ef1301f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * jp2: use new APIs for jasper 3Moody Liu2022-06-211-0/+31
| | | | | | | | | | | | | | | | | | | | | | using new APIs prevents the runtime deprecated warning. also note the memory limit is now set to 500MB Task-number: QTBUG-104398 Change-Id: I1b307ec33c6a540a5fb9121214d89a73a509a0d3 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 4011d03f84d19bdfa6e30b6b7a6792f90b30a259) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * jp2: use correct buffer_size for jas_stream_memopenMoody Liu2022-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | According to jasper's documentation, the second argument should be 0 instead of -1, to acquire such a dynamically growing buffer. This also causes a runtime crash due to the signedness of size_t. Fixes: QTBUG-104398 Change-Id: I173c6b7c9802c22fe0fa01083a71bf3b6ca7b134 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit ad2e721683b7c68748b05862fe8cf33bf63ebf55) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2022-06-151-1/+1
| |
| * Check earlier to avoid sanitzer warningsRobert Loehning2022-06-091-3/+7
| | | | | | | | | | | | | | | | | | | | Fixes oss-fuzz issue 47689: "load of value 65, which is not a valid value for type 'ICNSEntry::Depth'" Change-Id: Ia1b119d863e9518e308117ed1dd6a297297bc537 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit ea4684c6b17110d4ce0504f382da16462c048662) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Update bundled libtiff to version 4.4.0Eirik Aavitsland2022-05-3132-2823/+5210
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.4.0 Fixes: QTBUG-103337 Task-number: QTBUG-103671 Change-Id: I94a26d2d2186e4ea881588a04b0eafae0432be29 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 372ff593c65cdea4616cb2d6e1c8a53e6b22674d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Add finding from oss-fuzz to tst_qicnsRobert Löhning2022-05-251-1/+23
| | | | | | | | | | | | | | | | Task-number: QTBUG-103454 Change-Id: I86bf891e67bcd483ed0b551190244b94677d1751 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit a678f3df9d644ca054aea33e8b3e7e40ce300558) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Add some basic checking against corrupt inputEirik Aavitsland2022-05-191-5/+11
| | | | | | | | | | | | | | | | Fixes: QTBUG-103454 Change-Id: I169b0de8465bc5d90aebfd8250db0361819065c5 Reviewed-by: Robert Löhning <robert.loehning@qt.io> (cherry picked from commit 34731687ee77c59607db9d88c6361111631e48c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-241-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: If2b0a9883b455719d92bfef0d7f7eeaa26bcca5d
| * Bump versionTarja Sundqvist2022-04-061-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-2334-151/+341
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ieb442937b0cc31e15b39401f2a3234b99751d169
| * Update bundled libwebp to version 1.2.2Eirik Aavitsland2022-03-0333-150/+340
| | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.2.2 Change-Id: I9ddb18c0a8c247799d9e26ea32131c26295d0f4b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 0c8d5dc098093af211fc1a1d25a8408ed990fd2a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-102-2/+5
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I664a1a5b2445dc02ee7251395f507051e154245e
| * Fix vendored libwebp to build for universal macOSAlexandru Croitor2021-11-261-1/+4
| | | | | | | | | | | | | | | | | | | | The 3rdparty NEON libwebp sources need to built for the macOS and iOS arm64 slices when doing a universal build. Task-number: QTBUG-85447 Change-Id: Id55e58027adbea9e3d83e1a4b7309ff36cf01453 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit b01f23ed9b32a84c5ffd6f45f08c4b81705b1979)
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-1262-522/+1340
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I8f97dd74f81ed23ca3cb6634068e2c77e7ea9275
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I3b9bf25903e79d16d7d4e566846cc23f08acf625
| * Update bundled libwebp to version 1.2.1Eirik Aavitsland2021-08-2061-521/+1339
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.2.1 Change-Id: I68082fde6d20d32be87444f471520fb1e8091bf9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 80786b7a07b631bec56004bfeb67cb4157805268) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-1674-5933/+7682
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I5356ec1f7e44017b6337fc9451c1c04104eeb233
| * 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. Change-Id: If073e07929eb330766b49087d49531409a7548e5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> 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: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-161-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Icdfa64231de43964e5b3858dcea566e25d8ab569
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: Icd375adf76ee47c4192d9b6c7e86f7b1a20f5228
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-0781-926/+3829
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I0c8024a783a45e5369d64ac2ce0189f9d4b2899d
| * Avoid scanline overflow when reading corrupt tiffsEirik 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>
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: Iaeaef2d9491ac3570b4c0b5a38735536928ee5f3
| * 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>
| * Update bundled libwebp to version 1.2.0Eirik Aavitsland2021-03-0139-622/+736
| | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.2.0 Change-Id: Idb95b278c613361d82ea32bd9f591fbe87bfe66f Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 59aaed8409c1f3da2df426eba06d682d6bd7ec9b) 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>
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2336-747/+747
| | | | | | | | | | | | | | | | | | | | | | This reverts commit e78696656bfb28b42691ed0445f1a4f370b2d496. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I03badff0b1a3731ba0044162df19a83d83f4b8ae Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Avoid oob access when reading certain corrupt tiled tiffsEirik Aavitsland2021-02-251-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)
* Update commercial license headersTarja Sundqvist2021-01-2736-747/+747
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtimageformats. Documentation files, examples or tests are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4165 Change-Id: I610d62cee803b55d3676faa08d8947c6a8201355 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* TGA Plugin: don't print warning in QTgaHandler::canRead(QIODevice*)Christian Ehrlicher2020-10-311-2/+0
| | | | | | | | | | | | | Since 2878f06e5bd75029f699ce1564144c3a83a8b00e warnings are printed to stdout when a tga file could not be loaded. But canRead(QIODevice*) is called when the image format is not yet known which leads to unexpected warnings. Therefore remove the warning there again. Change-Id: I0ea8cb13b3fb655ed4eeea008a67e26a04e72892 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit 024527e1fa36fbe5f25e0e438d43d11cd15d68de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-291-0/+20
| | | | | | | | | | | | | - e02d4e57e19fb4b973bf736658fde82959d93ca9 Add changes file for Qt 5.15.1 + d4e82a2936f412fadbfefa240baeed6efd310a62 Fix qt_attribution.json files by replacing newlines with \n escapes + 93ae5523192b6d636a32986d9cae10294bca5a83 Bump version + 1cce99ccb1bcb0482e1b132ed634ad0f7ce2d251 TGA Plugin: print error message when tga could not be load + dd8edc701b7bcd90eddf8f4af824efdc4b21271e Add changes file for Qt 5.12.10 Change-Id: I46b6b8a6172a3b1dca8a28af7fe13d122d7e076a Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit ceaf64a82ea5dc7f37b8cb1865e817ae6deb751e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I3a6fc688501de1cde26f0e4c6db5b7c4ad4c10cf
* 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>
* TGA Plugin: print error message when tga could not be loadChristian Ehrlicher2020-10-041-0/+3
| | | | | | | | | | | When an image could not be loaded, the error message from QTgaFile was lost so the user could not find out why the load failed. Therefore print it out with qWarning(). Change-Id: I7ef7d8488ddd6c0c2be1d14caeb9ead528eb755f Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> (cherry picked from commit 8b48a7338d024cc8e41a52df7b2f0b4eb0e06280) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 05:49:57 +0000