summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats/jp2
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix compilation with disabled deprecated APIsSona Kurazyan2019-07-082-0/+4
| | | | | | | | | | The QImageIOHandler::name() has been deprecated since 5.13, but its overrides weren't. Enabled compilation of the overrides only when the QImageIOHandler::name() is compiled. Task-number: QTBUG-76491 Change-Id: I913f03f730969ea88864a5a08afe50c4eac533ca Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Move qtimageformats over to the new config systemLiang Qi2019-04-021-2/+4
| | | | | | | Task-number: QTBUG-44318 Task-number: QTBUG-62259 Change-Id: Ide5c28015c46b12ee3f21d06badd69db8bed1281 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove bundled, unmaintained libjasper source codev5.12.0-beta3Eirik Aavitsland2018-10-152-12/+6
| | | | | | | | | [ChangeLog][Third-Party Code] The unmaintained bundled libjasper has been removed. Building the jp2 handler will require libjasper to be present as a system or external library. Change-Id: Ic48cc6021fc5fb64fb369eb9621fd7a811e8e9f7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* 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-10/+10
| | | | | 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-45/+63
|/ | | | | | | | | | | 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>
* Fix null pointer use within Jpeg2000JasperReaderv5.5.1Neil Williams2015-09-091-0/+16
| | | | | | | | | jas_image_create will return null if the image create fails, so the return value must be checked. Task-number: QTBUG-47998 Change-Id: I4cb8a44742ca30d1f0b335b2db2c7f283c968c78 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Fix MSVC warning C4005: 'JAS_WIN_MSVC_BUILD' : macro redefinitionDebao Zhang2015-03-301-3/+0
| | | | | | | | This macro has been defined in the jasper.pri file: msvc: DEFINES += JAS_WIN_MSVC_BUILD Change-Id: I3ac06e4f373c59ded4e3c2ebfa6f50e40a3c83ae Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Fix compiler warnings.v5.5.0-alpha1Christian Kandeler2015-02-251-13/+13
| | | | | | | | The jas_image_coord_t is typedef'ed to int_fast32_t, which can be long. Change-Id: I78ed4731d9adf3ea9bd63092edd3f96a185d9c79 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Read grayscale JP2000 as grayscaleAllan Sandfeld Jensen2015-02-181-4/+1
| | | | | | | Return a real grayscale qimage instead of an 8-bit indexed qimage. Change-Id: I6f47bfe4268a675f8ce54f9daed10e94feb9e309 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* 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>
* Silence warning about unused parameterv5.4.0-alpha1Thiago Macieira2014-09-031-0/+2
| | | | | | | | | It's only used in debug mode. qjp2handler.cpp:1183:55: warning: unused parameter 'image' [-Wunused-parameter] Change-Id: I0260f21dbee2105f297af0224e25f14a88ee4557 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Update license headers and add new licensesJani Heikkinen2014-08-253-54/+30
| | | | | | | | | | - 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>
* Add JPEG 2000 plugin.Jake Petroules2014-02-116-0/+1419
It is moving from Qt Solutions. Change-Id: Ie0dc44d258597f871544fa43238528f42628b799 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>