summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Extend support for tiled tiff files to all color formatsv5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Eirik Aavitsland2017-03-1613-5/+25
| | | | | | | | | | | | | | | This commit extends the recently added support for tiled tiff images of color index format to also cover grayscale and mono images. RGB images were already covered, since the libtiff API used for those handles tiled images transparently. This commit also simplifies the tiff read() function by sharing common code among the different formats. [ChangeLog][TIFF] Extend support for tiled tiff files to all color formats Change-Id: I13f94bbca65dd6a35384a415906034e245ad8b79 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add support for tiled, color indexed tiff filesEirik Aavitsland2017-03-154-0/+24
| | | | | | | | | | | | For color index images, the tiff handler uses scanline based reading. The tiff decoder does not support that if the image is stored in tiled format. This commit adds tile based reading for such cases. [ChangeLog][TIFF] Added support for tiled, color indexed tiff files Task-number: QTBUG-12636 Change-Id: Ic759903c75c8252267429f01e3dd9706fc516f8f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add support for multipage TIFF images to QTiffHandlerv5.9.0-alpha1Sandro Mani2017-01-253-0/+45
| | | | | | | | | | | Allows multipage TIFF images to be read via QImageReader::jumpToImage and QImageReader::jumpNextToImage. [ChangeLog][QtGui][QImageReader] Support multipage TIFF images through QImageReader Change-Id: Id6ac68b75500148e51be11eff3d296c929d2d95c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix build after qtConfig changes in qtbaseLars Knoll2016-08-191-1/+1
| | | | | Change-Id: Ic2313cf8a6e938d5885aa1e26c36a5d7d5af166d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-084-2/+61
|\ | | | | | | Change-Id: Idf9bbf8661a1589ff27e58322117d56363ec3e4a
| * Add a Jpeg2000 handler that utilizes Apple ImageIO FrameworkEirik Aavitsland2016-03-171-2/+0
| | | | | | | | | | | | | | | | The Jasper-based jp2 plugin has been disabled by default. This plugin can replace it for OS X and iOS. Change-Id: Id43dbefdf7df22493910a855f823c9b966bafcdb Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * Add animation support to WebP pluginDayang Shen2016-03-103-0/+61
| | | | | | | | | | | | | | | | We now use WebP Demux API to decode both single image format and muxed animation format. Change-Id: Ia2922892a3a626e9921c3910801d7c975d9fc6a2 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Remove Windows CE.Friedemann Kleint2016-03-101-4/+0
|/ | | | | | | | | Remove #ifdef sections for Q_OS_WINCE, wince .pro file clauses and the CE-specific file qfunctions_wince.cpp. Task-number: QTBUG-51673 Change-Id: I839d6fa07e1929da2e2f2115bfc8aa670b3a117f Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-151-0/+1
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id59a8238134f1b0e172b22cd7e95d984a3f66401
| * Improve interpretation of undefined alpha-channelsAllan Sandfeld Jensen2016-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | Libtiff does not process the alpha-channel if its definition is not specified. However to match how Qt used to save TIFF images and how tested image viewers interpret them, we need to treat unspecified alpha channels as unpremultiplied. Task-number: QTBUG-50902 Change-Id: Id72218ed5bf702b54ffa3b5b47d6230facbfa0c4 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-01-2010-173/+123
|/ | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I7e6590b69032dec27030bde39035954d64866bba Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Skip (pass) each autotest if the corresponding handler not presentEirik Aavitsland2015-11-259-3/+55
| | | | | | | | | | | | | | Add a check at initialization of each autotest, skipping it if the relevant plugin is not installed. This is the same as in the qtimagereader autotest in qtbase (SKIP_IF_UNSUPPORTED macro). Reason for change: Not all format handlers are supported on all platforms. Hence, the suite of autotests ("make check") should not fail on account of a missing plugin. Change-Id: Ic0f4da68a9527831f017db0f326afe6e631efd9e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Handle Grayscale8 TIFFsAllan Sandfeld Jensen2015-05-291-14/+6
| | | | | | | | Correctly read and write Grayscale8 image format. Change-Id: I537c68f94077458c69ee1de08b5b37986b54aa26 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Optional application of orientation for TIFFAllan Sandfeld Jensen2015-05-191-12/+24
| | | | | | | | | | | | Make the image orientation only optionally applied for TIFF images to match the new image handler flags. The default however remains to apply transformation, as opposed to JPEGs. The patch also adds the capability to write metadata orientation. Change-Id: Ie24664516138641342ab6d7559d591f38b9f1e8a Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Correctly interpret RGBA tiff images as premultipliedAllan Sandfeld Jensen2015-05-121-2/+2
| | | | | | | | | | | | The TIFFReadRGBAImageOriented method turns out to return colors with alpha premultiplied by default. The only reason we pass our own tests is because we also save the colors incorrectly unpremultiplied. The patch fixes the format type of the returned images, and explictily writes the how alpha should be interpreted in the saved files. Change-Id: Ie1c3881acfe07eae25ca735adf243c1636f656a0 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Clean up reading TIFF headersAllan Sandfeld Jensen2015-05-041-0/+2
| | | | | | | | | | | | Split reading TIFF headers from the decoding to make it possible to read correct metadata on undecoded images. This fixes reading the image format from the QImageReader, and is necessary for later patches. Change-Id: Ida27e98252bf95459d87354586d4a5fba348efcb Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Update copyright headersJani Heikkinen2015-02-1110-70/+70
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-145-7/+0
|\ | | | | | | Change-Id: I96f7e13e5a6f65dae1a9f7717e30021f81cf1e81
| * Remove some material with questionable copyrightv5.3.2Lars Knoll2014-09-035-7/+0
| | | | | | | | | | Change-Id: I81bc4d678f717ccc73b0199d3dd0ba0d73be716d Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Update license headers and add new licensesJani Heikkinen2014-08-2510-189/+109
| | | | | | | | | | | | | | | | | | | | - 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 support for SubType and SupportedSubTypes options in DDS handlerIvan Komissarov2014-08-081-0/+11
| | | | | | | | | | | | Change-Id: I2fa563bf023871e9e99ed32829f978577eaf2a68 Reviewed-by: Alex Char <prevedtest@gmail.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Renamed A8R8G8B8_2.dds to A8R8G8B8.2.dds.Ivan Komissarov2014-08-053-3/+3
| | | | | | | | | | | | | | | | This fix is needed for further patch to be able to get image format (subtype) from filename. Change-Id: I0de72be6c8d1942e6ad63c4d131bd380379a5417 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-293-0/+3
|\| | | | | | | Change-Id: I15c1f7d4fd700c04f3f27720fc79abd3827eeeed
| * Fix DDS image writingaavit2014-07-013-0/+3
| | | | | | | | | | | | | | | | | | The code did not correctly do the 90-degree rotation needed for DDS, and would fail on non-square images. Task-number: QTBUG-39899 Change-Id: I1599e3fe44ff7895db8aa6e325fa8fdba2106694 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Save opaque images as opaque TIFF filesAllan Sandfeld Jensen2014-07-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | We currently save all non-indexed images as RGBA TIFF files. We should save them without an alpha channel, to save space and maintain the information that they are opaque. Task-number: QTBUG-18475 Change-Id: Id656f4078ea0a1b88235fb04add99a4680422354 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Add support for reading icon variants in ICNS pluginAlex2014-02-263-0/+2
|/ | | | | | | | Change-Id: I68395ac4e9604d852405643710aa79585974b3e3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Added webp image format pluginSteven Yao2014-02-1310-1/+139
| | | | | | | | | | | | | | | Also added auto test and config test. This plugin was disabled on winrt and android. [ChangeLog] Added webp image format plugin. Task-number: QTBUG-14205 Done-with: Liang Qi <liang.qi@digia.com> Change-Id: I9409e894d7fc1aef9dce4ffdff8bdf483d689774 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add JPEG 2000 plugin.Jake Petroules2014-02-116-1/+104
| | | | | | | | 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>
* Fix reading palette images in DDS handler.Ivan Komissarov2014-01-134-0/+2
| | | | | | | Change-Id: I039a5f3376a8ebe7230f30a0df31c4a355f22349 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Alex Char <prevedtest@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add ICNS (Apple Icon Image) plugin.Alex2013-12-1715-1/+155
| | | | | | | | | Change-Id: I98f79d781e5986ee5602438e02d761c7f5a77217 Reviewed-by: Ivan Komissarov <ABBAPOH@me.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix writing images in DDS handlerABBAPOH2013-12-021-0/+29
| | | | | Change-Id: If433528eb4cfa7448f171e083dd2bb559dbc2f4a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add Direct Draw Surface pluginABBAPOH2013-11-2652-1/+215
| | | | | | Change-Id: I8dfa6001c1aae2dcb5f2e6e0bfd142ef1f9dddbc Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* test: Remove insignificant_test from tst_qtiffSergio Ahumada2013-05-131-2/+0
| | | | | | | | | This test is now passing on all CI platforms. Task-number: QTBUG-28320 Change-Id: I6e0977980cfe788a087646eb751b113f83e8dd12 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-026-6/+6
| | | | | Change-Id: I82e67b5704007d838d6ab1ee1bc9a870bff7d4c8 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* test: Mark tst_qtiff as insignificantSergio Ahumada2012-12-011-0/+2
| | | | | | Task-number: QTBUG-28320 Change-Id: I2cc7e01c0d7cc525ba4423006c1cc876f6b66942 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-236-144/+144
| | | | | | | | 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>
* remove qmake -project boilerplateOswald Buddenhagen2012-06-256-18/+0
| | | | | Change-Id: I22368f64dcb046b2d0a0296ff506be4a02acd887 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Add wbmp pluginaavit2012-03-016-1/+97
| | | | | | | | | | | 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>
* Move tga support from Qt3d to QtImageFormats.Toby Tomkins2012-02-085-1/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rev-By: Samuel Rodal Fix-for: QTBUG-21955 Part of fix for https://bugreports.qt.nokia.com/browse/QTBUG-21955 Having tga plugin inside a Qt add-on causes packaging problems. There have been many queries over the years for tga support even tho it is a niche image format. It is particularly useful for OpenGL work as a texture format since it is a blittable bitmap, but it is very innefficient compared to png or jpg. For this reason only read support is added, and this is documented. Also add one unit test. (based on cherry picked from Qt 4.8 commit 951a997893407b0a26f21fe0acec4701fa3d4279) Adds code removed from Qt3D. http://codereview.qt-project.org/#change,13898 Conflicts: tests/auto/qimagereader/qimagereader.pro tests/auto/qimagereader/tst_qimagereader.cpp Change-Id: Ia1b7420dd3461cb1d2f1d857d11444a0a533de43 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add TIFF pluginKent Hansen2012-02-0147-3/+742
| | | | | | | | | Moved out from qtbase. Task-number: QTBUG-23887 Change-Id: I57d30173e6624d41dba1610084a7ed949ae84d1d Reviewed-by: aavit <qt_aavit@ovi.com> Sanity-Review: Kent Hansen <kent.hansen@nokia.com>
* Remove "All rights reserved" line from license headers.Toby Tomkins2012-02-012-4/+6
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ifd6d629498499b72fbe2b393f25c774a72de9456 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Long live the qtimageformats moduleKent Hansen2012-01-2513-0/+250
This module contains plugins for image formats that aren't part of the "core" (qtbase) offering, starting with mng. Task-number: QTBUG-21869 Change-Id: I85e51ed6f84c07419b1676f9def234c36f10141f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: aavit <qt_aavit@ovi.com>