summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats/wbmp
Commit message (Collapse)AuthorAgeFilesLines
* Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-081-5/+0
| | | | | | Pick-to: 6.5 Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-251-1/+1
| | | | | | Task-number: QTBUG-105718 Change-Id: I3598499ab89b0e88718eded846306511000e8db9 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-071-0/+3
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: Ifbf0be4c6f03259f9d084bbef4cf44fa60bf3fde Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-133-114/+6
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I775d4a0c07b2b82a097d36649203e7f6223fdc51 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* CMake: Use renamed qt6_add_plugin PLUGIN_TYPE optionAlexandru Croitor2021-08-101-1/+1
| | | | | | | Task-number: QTBUG-95170 Pick-to: 6.2 Change-Id: I375fdfe41dcb17846a97ff5ae2dbfa38493360a2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* CMake: Don't give plugins PUBLIC usage requirementsJoerg Bornemann2021-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | The pro2cmake.py conversion script faithfully reproduced the .pro files for the plugins, which specified the libraries as public. But in CMake, the implications of this are that public usage requirements should then be propagated to consumers. We don't expect any consumers, since a plugin is created as a MODULE library in CMake, so for Windows we don't even have an import library to link with. The only exception to this is for static builds where plugins are created as STATIC libraries instead, but only in certain controlled situations do we then link to plugins. Even then, usage requirements are not expected to propagate to the consumers, so these relationships should always be specified as private. Pick-to: 6.2 Task-number: QTBUG-90819 Change-Id: I8ec7cf501c13cfc9b107ae38f70cba3536b196e4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Use checked image allocation on readingEirik Aavitsland2021-03-051-1/+3
| | | | | | | | | | | | 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. Pick-to: 6.1 6.0 Change-Id: If5b87cd1b7b2de67ecd023a82ae2168a032fa52e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove QMake project filesJoerg Bornemann2021-02-112-30/+0
| | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I43bd344cd515aa2f671d012c64f281e8fc4793c9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* CMake: Regenerate projects before API changeAlexandru Croitor2020-09-231-1/+1
| | | | | | | Task-number: QTBUG-86815 Change-Id: Ie06af33cee62d1742fabc4b992e6bc5a68fcc6a1 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Regenerate and fixup qtimageformats projectswip/cmakeAlexandru Croitor2020-03-162-7/+6
| | | | | | | | | | | | | A few changes happened since last update: - CMake target names are now consistent with Qt 5 names - ZLIB handling - TIFF 3rd party handling - Standalone tests simplification - Updates in the SUBDIRS project - Other minor changes Change-Id: I85cca79d38feca44c5b78dae48c79779ae05e288 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-161-3/+3
|\ | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: Ia9a6efda0bea5bc7c5f9f8cd4735da0bd3c0da26
| * Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-221-3/+3
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I550c7f757567dbcc914e6869c29563b4f3e76a52 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Regenerate projects to be in sync with the scriptAlexandru Croitor2019-11-151-2/+1
| | | | | | | | | | | | Change-Id: I30d599c2f5e74293ff7037b5e667c0a3dab5be87 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Regenerate projects before mergeAlexandru Croitor2019-10-152-6/+6
| | | | | | | | | | Change-Id: I9a889214e310b95ca1418925d6413602f9e00cea Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Regenerate qtimageformatsAlexandru Croitor2019-06-062-0/+4
| | | | | | | | | | | | | | Ends up adding plugin class names and types. Change-Id: I3824a3a00cf6f56442a0494effcf641e22b3dcc7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Initial CMake PortAlexandru Croitor2019-05-282-0/+36
|/ | | | | | | | | Port 90% of imageformats to be built with CMake. Missing support for mng plugin and documentation. Change-Id: I1d7e4b93c6f8446468f00dbf0663a6a4ec8c9774 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QWbmpHandler: fix integer overflowMarc Mutz2017-01-051-1/+1
| | | | | | | | | | | Both 'hdr.height' and 'hdr.width' are quint32s. Multiplying them still gives a quint32, but the lhs expected a qint64. Fix by casting one of the operands to qint64. Coverity-Id: 22179 Change-Id: If7385fb42bf994d87ac4e603fa85be4a30ad6d5c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Remove unused former overridersAlexander Volkov2016-12-051-6/+0
| | | | | | | | QImageIOPlugin::keys() was removed in Qt 5.0 by c9d040c1f5b0ee0ddd37e924576ec3bbd990f2ed in qtbase. Change-Id: Ifda96e4764aa82d6f608d9ee2e29bac554603705 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Add missing override and remove redundant virtualAlexander Volkov2016-12-052-8/+8
| | | | | Change-Id: I12f79f8fecdd03e4e6d4ce76e49d3c2d91003676 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-071-4/+4
|\ | | | | | | Change-Id: Iaf805dab2dd057ca756e4034b9f5f55ac8bb097d
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-4/+4
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I1970c3588d4ef3140adb655c01291e585b4f25b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-01-203-42/+60
|/ | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I6ae2887539c66fa4e1388a9486fe798f2e595434 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-113-21/+21
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I6aafb5f38bfaf68a9f4eaca69a56006db5cd8843 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Update license headers and add new licensesJani Heikkinen2014-08-253-57/+33
| | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I803e1abdc6f126d5251746422e16fff7463f2dff Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-023-3/+3
| | | | | Change-Id: I82e67b5704007d838d6ab1ee1bc9a870bff7d4c8 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Add PLUGIN_CLASS_NAME to qtimageformats pluginsv5.0.0-rc2v5.0.0Miikka Heikkinen2012-12-101-0/+1
| | | | | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 # ==[ Subject: One line only short meaningful description for logs ]===| Change-Id: I15365a9ccf1a5b136ea7e01c4530108631498a2a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QImage plugins should report supported mime typesAllan Sandfeld Jensen2012-11-281-1/+2
| | | | | | | | | Extend JSON plugin descriptions with supported MIME types. Task-number: QTBUG-28177 Change-Id: If8e64a4a0f052718510383a74622598d741640d3 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* adjust to qt_plugin.prf changesv5.0.0-beta2Oswald Buddenhagen2012-11-011-4/+2
| | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: I5dd40f4fb6bfc6723ed96241f41301b32393dd34 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-233-72/+72
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ia126f46d5f67e9acf9e2efc8bf99c50fd1c22809 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix warning in profile.qt-v5.0.0-alpha1Friedemann Kleint2012-03-121-1/+1
| | | | | Change-Id: I3f38e242e0519bffd297a9073a65875946beed05 Reviewed-by: aavit <qt_aavit@ovi.com>
* Add wbmp pluginaavit2012-03-015-0/+562
This is a port to Qt 5/qtimageformats of the contribution https://qt.gitorious.org/qt/qt/merge_requests/1117 by Dmitry Zelenkovskiy <Dmitry.Zelenkovskiy@nokia.com> Change-Id: I9cdd249d3c58c5f922ccd2d43f92f1bd2e3fd86f Reviewed-by: Jason Barron <jason.barron@nokia.com> Reviewed-by: aavit <qt_aavit@ovi.com>