summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-1673-5932/+7681
|\ | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-0780-925/+3828
|\| | | | | | | | | | | 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>
| * 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>
* 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>
* Fix qt_attribution.json files by replacing newlines with \n escapesSamuel Gaist2020-08-281-2/+1
| | | | | | | | | | | | | | | In their current state theses files contains invalid json. While they are parsed successfully by qtattributionsscanner, they cannot be loaded by libraries such as Python's json module. This patch fixes this. The output generated by qtattributionsscanner stays the same. Change-Id: I4692a8e99a492c401d42320beacbc103c6a61319 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 0fda7edeb8abeddf8391cc4aa8fd4c03add01ccf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* fix build on Arch LinuxEvgeniy A. Dushistov2020-08-171-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 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 704868db61be1542c2d9e2b75ead00c45c56cc36) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix UB in webp decode and memory leak in encoderAllan Sandfeld Jensen2020-05-181-2/+7
| | | | | | | | | | | Ensure the ICC block is aligned before parsing and clear the writer after we have initialized it. Fixes: QTBUG-84267 Change-Id: I7e16ee7663dbe404b4819769deab7d9c9b6c8f20 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit b761ff58d6d7b0604d88d6bd332b4470044ffe6a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* winrt: Enable webp for winrt arm configurationsv5.15.0-beta4v5.15.0-beta3Oliver Wolff2020-03-281-1/+1
| | | | | | | | | The fix from upstream has landed in Qt so that webp can now be enabled for that configuration as well. Task-number: QTBUG-71251 Change-Id: I772decad30c91c6e028af05bdba0601ebd1574df Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Update bundled libwebp to version 1.1.0Eirik Aavitsland2020-03-2733-85/+166
| | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.1.0 Change-Id: Id41e437610947b9e6b86205317a469b052dccb5d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Remove overrides of QImageIOHandler::name()v5.15.0-beta2Shawn Rutledge2020-03-0316-83/+0
| | | | | | | | | | Since name() returns format() by default, these haven't been necessary for a long time. We will remove the base class function in Qt 6, so we should remove the overrides and other uses now to ensure that it will be OK. Followup to 7ad0ef0f31afd89509dc2cb3c102b22c0e6c725c. Change-Id: If3b83a36a36747f8e57775053166edd98512e684 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-251-2/+2
|\ | | | | | | Change-Id: Ib2aaec7a6d8a1bf6f7201c55f0871c0aa27d02a4
| * tiff: do not try to read 32bpc as 16bpcEirik Aavitsland2020-02-241-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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-151-1/+1
|\| | | | | | | Change-Id: I6bc111acb8e9a296404466f80f051a969bca5ddd
| * Fix NEON support on Android armeabi-v7a for webpAndré Klitzing2020-02-061-1/+1
| | | | | | | | | | | | | | | | Sibling of caef33ae2df64eb397eadfc4ce4735545ff93ea5 Task-number: QTBUG-81461 Change-Id: I26bb7b65c9d25952d338f5684e145f91eb9695a8 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-211-2/+14
|\| | | | | | | Change-Id: Ie91dbdde92b2b87b60b4861234be718410154ff4
| * Fix rendering errors with animated webp filesMichael Brasser2020-01-201-2/+14
| | | | | | | | | | | | | | | | | | * Respect blend_method. * Apply dispose_method when rending the *next* frame, and only for the given frame area. Change-Id: I60a8c7010a46a2a66339c87f74927a02aee7dcf3 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-302-12/+10
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I89d7e0498ff3f7818bfe8c1a3a6da3c9440ab30a
| * Do not explicitly disable plugins for winrtOliver Wolff2019-12-171-6/+0
| | | | | | | | | | | | | | | | | | | | The ability of building these plugins is part of configure.json and should not be hard coded. The plugins can be built for winrt. Fixes: QTBUG-71251 Change-Id: I9a6b0dcdd031d37339282caab4596978c52ae5a0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * winrt: Disable libtiff for x86 configurationsOliver Wolff2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For some reason the build of libtiff fails during linking for x86 configurations (unresolved symbols GetFileSize & CreateFile) while it works as expected for x64 and arm. Disable that configuration, but keep support for working scenarios. Task-number: QTBUG-71251 Change-Id: I181a42378584af8c2fffccbb3ddd252e4a057dfb Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Disable the webp plugin for winrt on ARMOliver Wolff2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | There is a bug in libwebp which prevents building the plugin for an ARM winrt configuration. Until the bug is fixed upstream, the feature should not be available for these configurations. Task-number: QTBUG-71251 Change-Id: I10313d4fe63dc25cefed3153d9acf1f3b12c05a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Use pkg-config to find dependenciesMarius Kittler2019-12-171-4/+8
| | | | | | | | | | Change-Id: Ifa826410494f65a560fe8dea999d4665f2f1191b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add support for reading BigTIFFEirik Aavitsland2019-12-201-3/+8
| | | | | | | | | | | | | | | | | | | | | | All recent versions of libtiff has support for the 64bit-indexed BigTIFF format. Allow reading it by recognizing its magic number. [ChangeLog][TIFF] Add support for reading BigTIFF Fixes: QTBUG-80538 Change-Id: I7fcb72d77e4a0bdcb38ab96e9f6cfaff7cf4ad49 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-229-28/+28
|/ | | | | | | It is being deprecated. Change-Id: I550c7f757567dbcc914e6869c29563b4f3e76a52 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-0931-712/+2630
|\ | | | | | | Change-Id: Iaaf98e10d41867b2c6ceda89cb5c9c315301190b
| * 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>
* | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-10-308-112/+91
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib4b1a3a3604fdce35f61dadc26770ca9b749e008
| * Tiff: Include two upstream CVE fixes in bundled libtiffv5.13.2Eirik Aavitsland2019-10-238-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) Fixes: QTBUG-79397 Change-Id: I29257e6dbfbd816224d3dbaefdbe8afecd25f288 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Tiff: Align 16 to 8 bit colormap conversion to libtiffEirik Aavitsland2019-10-291-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For paletted images, tiff stores a color map with 16 bit deep entries. When reading such images, the tiff handler tried to be clever in the 16 to 8 bit mapping, but this resulted in slightly different result than what libtiff itself produces if asked to read and convert such an image (TIFFReadRGBAImageOriented()). libtiff simply ignores the lower 8 bits, so we should do the same. Importantly, this makes no difference when 8 bit original data is stored in the orthodox 16 bit way, where e.g. 0xAB is stored as 0xABAB - like we do. However, the alternative storages 0xAB00 and 0xABFF exist in the wild, even in sample images in Qt repos. Also, if we later should want to support proper 16 bit data here, the previous code was anyway wrong: just dividing with 257 is highly unorthodox. The correct way would be to use proper rounding like QRgba64::toArgb32(). Fixes: QTBUG-79522 Change-Id: I7bd90ad7b89a923bd431781f4927b13ad0544407 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Qt Forward Merge Bot2019-10-121-20/+8
|\| | | | | | | Change-Id: I2437b8b4b535e4f02740070e0352e1825c67fa3c
| * 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>
* | Fix JasPer version checkv5.14.0-beta1v5.14.0-alpha1Joerg Bornemann2019-09-191-3/+8
| | | | | | | | | | | | | | | | | | | | | | The compile test for JasPer tried to check for a certain version number at run time, which is pointless, because we never run this test. Turn the run-time check into a compile-time check. Change-Id: I7c9de67a35edadf6a13b32b0faf48ac728a80fc0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Fix and re-work compile testsJoerg Bornemann2019-09-181-97/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compile tests were seriously broken, and we didn't notice, because configure leniently ignores the second level "test" object and the inline sources provide the absolute path. Merge the 2nd level test objects with the right ones. Remove superfluous label entries. Remove superfluous qmake entries. The inline sources already provide the right -l argument. Remove superfluous return statements. The generated main function already returns 0. Remove superfluous "type" entry, because "compile" is the default anyways. Note that the jasper version test is bogus, because these are compile tests that are not actually executed. The reference to JAS_VERSION is kept to test for existence of this define. Fixes: QTBUG-78473 Change-Id: I1d4fa634e29329cfc34c0a2f78b2eb730ef84d50 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix build after QColorSpace API changesTor Arne Vestbø2019-09-051-2/+0
| | | | | | | | | | Change-Id: Iff3186cf4eccae5fc7e7e3c55c5e6eb662be9519 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-042-14/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: Ied7ff6d61393b0e6db5c5984d8ab735ddaffad72
| * | Support writing WebP color space profilesAllan Sandfeld Jensen2019-08-212-14/+55
| | | | | | | | | | | | | | | Change-Id: I9d9473c2866d9792cd8752816a291be04e39ec19 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Fix Android multi ABIs compilationBogDan Vatra2019-08-281-11/+14
|/ / | | | | | | | | Change-Id: I983e2559d27ab5778f0af16f659786c0d78f4338 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Read color space from WebPAllan Sandfeld Jensen2019-08-192-0/+18
| | | | | | | | | | Change-Id: If1b9645fe07fb2cf15dbf2421d6c66b20f02bdb6 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Read/write ICC profile in TIFF pluginAllan Sandfeld Jensen2019-08-171-1/+18
|/ | | | | | | Adds reading and writing of embedded color spaces on the TIFF plugin. Change-Id: I53e8a16ff65f7986e9d51a5b543335e27b43e346 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 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 17:20:55 +0000