summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.0' in qt/qtimageformatsv6.0.46.0Jani Heikkinen2021-04-281-2/+2
| | | | | Change-Id: Id728b47697240f8b3935c4ed0f635bd0a6e8dcd5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-04-261-2/+2
| | | | | Change-Id: I7c849a337f268055acc8b55527f1f48b0b5d0c33 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-04-121-2/+2
| | | | | Change-Id: Iad349f47cef81bad3ec11f101f23009a3baf77d0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionJani Heikkinen2021-04-013-3/+3
| | | | Change-Id: I0fa60fc935b3987d33eedb6b2a077083b26f5e48
* Use checked image allocation on readingEirik Aavitsland2021-03-307-29/+39
| | | | | | | | | | | | | Use the imageIO's common QImage creation function that implements QImageReader's allocation limit that was introduced in Qt 6. A few related checks against corrupt image files added as driveby. Change-Id: If5b87cd1b7b2de67ecd023a82ae2168a032fa52e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 3dfd4dd8068284465302ecc46cc024e62a931d1a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtimageformatsv6.0.3Jani Heikkinen2021-03-261-2/+2
| | | | | Change-Id: I4792ebe78a72a8ad96f1ac38faae62e638fc15ea Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-03-221-2/+2
| | | | | Change-Id: I99f7692f5adf3c7ea6a4cec2b9699269ce56a0c6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionJani Heikkinen2021-03-053-3/+3
| | | | Change-Id: I0d77daa58b629e5b270a35986c83cc7eea4336af
* 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 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>
* 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 dependencies on '6.0' in qt/qtimageformatsv6.0.2Jani Heikkinen2021-02-251-2/+2
| | | | | Change-Id: Ic87a7af65833c1051bf0dbccf8c69188aa11d5ec Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* 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>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-02-221-2/+2
| | | | | Change-Id: I977e007d1c8ca09dc1ed31d622c353773a241a9e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionJani Heikkinen2021-02-183-3/+3
| | | | Change-Id: Ia9ff722bafa6c0b3a2b1887f80027eb3b9ab990f
* Do not use API deprecated in Qt 6Eirik Aavitsland2021-02-011-1/+1
| | | | | | | Change-Id: I8dc7a639a8cbabafb309ae298f1a5f9250bf055e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 183e8d70a7a12f99c5a0853d7dae0026e74a91b1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtimageformatsv6.0.1Jani Heikkinen2021-01-281-2/+2
| | | | | Change-Id: I2fcac4a84d212c209ec146440f4e3ed338852231 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-01-201-2/+2
| | | | | Change-Id: I571a53e3975a1fd5a71396c2a83acd4f542feb39 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-01-191-2/+2
| | | | | Change-Id: I09434bec724779a65e1f7a997eed554756a9a319 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix version number in conanfile.pyJani Heikkinen2021-01-181-2/+2
| | | | | Change-Id: I9f8600111c229be3316a69c587d8965a6f02db65 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-01-171-2/+2
| | | | | Change-Id: Ie1662d8c79ab7d3c591ab86dfd7fe4d5e0b6235f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add conanfile.py to support builds with ConanIikka Eklund2021-01-171-0/+129
| | | | | | | | | | | | | | | | | Support building with Conan against Qt6 base binary package. The build recipe expects to locate QT_PATH from env. The 'qt-cmake(.bat)' is used for the build. 'CMAKE_TOOLCHAIN_FILE' is used to pick the toolchain file for cross compilations. For Android builds 'ANDROID_SDK_ROOT' and 'ANDROID_NDK_ROOT' need to be passed from env. Pick-to: dev Change-Id: I2552410c5c6a01f49fb43b25fa542bc7c2bcbf78 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-01-151-1/+1
| | | | | Change-Id: If326dd82f1b63af927270db9fd044f6a2c5f56a0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-01-121-2/+2
| | | | | Change-Id: I493035b787480ea9a2b1a8537161c5cd2bfb6002 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add a flag to build the documentationToni Saario2021-01-112-0/+6
| | | | | | | | The Qttools is required for the QDoc for building the docs. Change-Id: I9863540aa65d27b89f6346ce7b449d56d44986b8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit dc8c1a980082ef24ae234f87ba8580bd558f6d0e)
* Bump versionPaul Wicking2021-01-072-2/+2
| | | | | | | Task-number: QTBUG-89789 Change-Id: I4af90d4544f4ab8c15466322ce7bbd098fe5c6f4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-01-071-1/+1
| | | | | Change-Id: I73317b13511311d4fe920cb5d89294e59fcf185d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-01-040-0/+0
| | | | | Change-Id: I4ac5429150d45c85d906ab9c8b83f2271b56d617 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2021-01-041-1/+1
| | | | | Change-Id: I9c5ad03e5a10384587afac22394f62a146715307 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add general changes file for Qt 6.0.x releasesJani Heikkinen2020-12-171-0/+19
| | | | | Change-Id: I5410ba984fafac5cc0d218b1fe0b45f265f1fd17 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* CMake: Re-generate configure and project filesJoerg Bornemann2020-12-106-5/+346
| | | | | | | Change-Id: Ifc9d3ee1d856c750556962b0fac8d054fcfee970 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 6c832068a6749a334a3e7bf6d888d46dfd88e34b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix linking of WebP through CMake APIKai Köhne2020-12-101-2/+2
| | | | | | | | | | | | | The library target name is WebP::libwebpmux, not WebP::webpmux [ChangeLog][Build System] Fixed an error that might have led to not compiling webp plugin when configuring Qt yourself. Fixes: QTBUG-89280 Change-Id: Iaccad7d1b2ce580c6154d9bd01d5cc2d59ce7e56 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit d1819dbd36cd2abe543bb5824032b724c169a38c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Ensure clean exit from configure in case of no-gui buildEirik Aavitsland2020-12-101-2/+2
| | | | | | | | Fixes: QTBUG-88734 Change-Id: Ib2630658085d12de0151365fccf8e3ae9546c562 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 7ee2148f24c49ce23db53e1e5b1672d9b4d86f46) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qtimageformatsJani Heikkinen2020-12-101-1/+1
| | | | | Change-Id: I68052a2b7fab954a19ccc343567e608036a8d512 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add Qt 6.0.0 changes fileJani Heikkinen2020-11-121-0/+17
| | | | | | | | | | Qt 6.0.0 is new major version for Qt and so on we don't need to list changes to the previous Qt release but quide readers to check porting quide. Task-number: QTBUG-88099 Change-Id: I6d93561980baa09e779ea09a7f805c8b800e0102 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* CMake: Build docs for imageformats repoAlexandru Croitor2020-11-102-0/+9
| | | | | | | | | | | pro2cmake only generates qt_internal_add_docs() calls for module targets. qtimageformats doesn't have any modules, but still needs documentation. Create a custom interface library target and provide it as the argument for the qt_internal_add_docs() call. Change-Id: I1cf4942f291cff90b7765534a8db7630c2c9cd78 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Rename "Porting" pages to "Changes"Jerome Pasion2020-11-092-3/+3
| | | | | | | | | | | | | | The content in the porting guides are closer to a changelog than a porting guide. At this point, it is easier for maintainers and contributors to write in a changelog than a guide. This change should help with readability and is closer to the usage of "Changes" in documentation. Part of a rename in other submodules. Task-number: QTBUG-87156 Change-Id: Ibc0ef3d39c2d5defb0ef8b1e7f1e9f83cac83a52 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Update dependencies on 'dev'Jani Heikkinen2020-11-091-1/+1
| | | | | | | Update Qt 6.0 Beta4 content Change-Id: I41d1e39731a7ba7c8a623f2576919d813843643c Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update dependencies in 'dev'Jani Heikkinen2020-11-051-1/+1
| | | | | | | Update Qt 6.0 Beta3 SHAs Change-Id: Ie262db1dddc1075bca83b144bf3688ba47fd0472 Reviewed-by: Antti Kokko <antti.kokko@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 Pick-to: 5.15 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* 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>
* Update dependencies on 'dev' in qt/qtimageformatsJani Heikkinen2020-10-281-1/+1
| | | | | Change-Id: Id88ef6b6af07f03f7226c29ef1fa813476524942 Reviewed-by: Liang Qi <liang.qi@qt.io>
* 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>
* Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-10-141-1/+1
| | | | | | | Use same qtbase as in Qt 6.0 Beta1 Change-Id: I46a17f85eaa2dc39a51098e6235fcb40b25f5f81 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-10-071-1/+1
| | | | | Change-Id: Ie5868f26b04d6185ef66791977d70f76c9ac2ab3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_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 Pick-to: 5.15 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
* Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-10-021-1/+1
| | | | | Change-Id: I8d60a7544d298442a4a787dd763010c8d555aa24 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: Disable usage of CMake API compatibility wrappersAlexandru Croitor2020-10-011-0/+5
| | | | | | | | | Setting the QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS variable in the project ensures we ported away from old API calls. Task-number: QTBUG-86815 Change-Id: I4582f9f87571e1d25571c42ba20700b3dc79c07c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-10-0113-36/+36
| | | | | | | | Modify special case locations to use the new API as well. Task-number: QTBUG-86815 Change-Id: I045015a4f3b78f15570ea401d2b99ea1b75ec414 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-09-281-1/+1
| | | | | Change-Id: If8befbe2710baaf0fa91118c674ada3847d5a7bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 23:30:09 +0000