summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix few misses from last copyright headers update.Julien Brianceau2015-08-274-756/+0
| | | | | | | | | | The documentation template with outdated copyright information is removed, it's not used anymore. Change-Id: Idc93bee04339739807c15f37c5bbbee1bbdd34c4 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-091-1/+1
|\ | | | | | | Change-Id: Ief86005c1309fdd08f32513782ee75f7e9751bc1
| * Re-enable WebP support on iOSMike Krus2015-06-301-1/+1
| | | | | | | | | | | | | | | | Previous work for Android appears to have fixed iOS related issues. Works fine for loading textures in Qt3d Change-Id: I54dbc0b57035e2777bac9e05842a64d4283efbd8 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Prospective fix for build on iOSSimon Hausmann2015-07-221-0/+1
| | | | | | | | | | | | | | | | | | Similar to commit 954fa54a88cff31a7fc869a49d17474ab1da8459 we also need to include the header that provides the jas_eprintf function declaration. Change-Id: I5f1e2e44bccf960ac88a21847e796e4548fcc4be Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-03248-35469/+14028
|\| | | | | | | Change-Id: Id8a59a58c7e5ca2f977c1e7408ff05033a9cc16b
| * Handle Grayscale8 TIFFsAllan Sandfeld Jensen2015-05-291-4/+39
| | | | | | | | | | | | | | | | Correctly read and write Grayscale8 image format. Change-Id: I537c68f94077458c69ee1de08b5b37986b54aa26 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Android: Build webp pluginEskil Abrahamsen Blomfeldt2015-05-202-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to include the cpufeatures module in the build for Android, and we need to make sure the neon files are compiled with neon flags turned on. Since these are .c files, we cannot use the regular simd.prf approach, which only supports .cpp, so the compiler is basically copy-pasted from simd.prf, but using QMAKE_CC instead of QMAKE_CXX. [ChangeLog][Android] Added support for webp image format. Change-Id: Id702b8202bee963d23beb02a7dc163756c8ca712 Task-number: QTBUG-38715 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * Optional application of orientation for TIFFAllan Sandfeld Jensen2015-05-191-104/+73
| | | | | | | | | | | | | | | | | | | | | | | | 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-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | 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-042-88/+151
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-152-19/+8
| |\ | | | | | | | | | Change-Id: Ib6f1512a15f2714a712ff82df55a9d3de8e46ffd
| | * DDS: fix image format checkv5.4.2Maks Naumov2015-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replace duplicated bBitMask check by the intended gBitMask check. Change-Id: I6d1780a4112e88484de661f07a15f2121602b86c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Replace malloc'ed tables with QVarLengthArrayAllan Sandfeld Jensen2015-03-171-17/+6
| | | | | | | | | | | | | | | | | | | | | Basic cleanup using proper Qt classes instead of malloc. Change-Id: I532b47aac7cfe15a5963371224288bec08135f25 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Correct mask of A2B10G10R10Allan Sandfeld Jensen2015-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Green mask is missing an F. Change-Id: I7387ef01ee414abc1a48efec71d71f46922c1bed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * | Remove more extraneous files from bundled libtiffEirik Aavitsland2015-04-09142-29895/+0
| | | | | | | | | | | | | | | | | | | | | They are HOWTO-RELEASE, SConstruct, nmake.opt and html sub directory. Change-Id: If7d3aad3a353caa14239b1faf0af8b9cd393bcf7 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | libwebp: update patches to 0.4.3 for Qt usageLiang Qi2015-04-092-13/+61
| | | | | | | | | | | | | | | | | | Change-Id: I1b333671e778824cc29b9c2125121fc7f1889b4d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * | libwebp: update to 0.4.3Liang Qi2015-04-0999-5344/+13662
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libwebp 0.4.3, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. The patches required to build it in Qt will follow in separate commit(s). Change-Id: I23ebfd69e47a468c91a9e9b109e9cb8ac63705d4 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> 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>
* | | Fixed calculation of normal maps in DDSIvan Komissarov2015-04-281-12/+12
|/ / | | | | | | | | | | | | | | | | This fix changes range of values for Z coordinate to 0..255 instead of 127.5..255 for ATI2 textures Change-Id: I53e7243c913483043599442ce13e42b07ee22ce6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.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>
* | Use std math on doubles and include cmathSean Harmer2015-02-181-0/+2
| | | | | | | | | | | | | | | | Required to build on QNX 6.6. Change-Id: If45aef4e3c0488f390187858e8ecafb18d7f5960 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.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>
* | Cleanup math includeAllan Sandfeld Jensen2015-02-161-6/+6
| | | | | | | | | | | | | | Use cmath methods Change-Id: I8e2f76f78440b6db84174e3f56e734db35abad68 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | Update copyright headersJani Heikkinen2015-02-1130-209/+209
|/ | | | | | | | | | 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>
* Avoid implicit function declaration compile errors in libjasperv5.4.0-rc1aavit2014-11-176-12/+17
| | | | | | | | | | | | Compilation for macx-ios-clang_OSX_10.9 would fail since the jas_eprintf function was used undeclared. Fix by #including jas_debug.h before4 use of that function. Also restructure some code in jpc_tsfb.c to prevent the same issue for jpc_tsfb_synthesize2 and jpc_tsfb_analyze2. Change-Id: Ib5b444873af6aa756d1c77145acdd863eaca0bd2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Disable webp also for iosaavit2014-11-171-1/+1
| | | | | | | | Already disabled for android and winrt; seems that libwebp's use of neon does not compile. Change-Id: Ia119244da1ae3c92f69dfe5ed91d20e665102958 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* QMngHandler: Avoid endless loopaavit2014-11-051-1/+1
| | | | | | | | | In case the animation only has one frame, like Waves1.mng in the bug report. Task-number: QTBUG-42321 Change-Id: Id6616f4f51c1b6f06f7e4677cbd9e56135d2a52b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QMngHandler: Prevent division by zero.Friedemann Kleint2014-11-041-1/+2
| | | | | | Task-number: QTBUG-42321 Change-Id: I1d0762782e71fb13f96d0f42c4661b708e02051d 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-2529-548/+316
| | | | | | | | | | - 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-082-2/+143
| | | | | | Change-Id: I2fa563bf023871e9e99ed32829f978577eaf2a68 Reviewed-by: Alex Char <prevedtest@gmail.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-3/+3
|\ | | | | | | Change-Id: I15c1f7d4fd700c04f3f27720fc79abd3827eeeed
| * Fix DDS image writingaavit2014-07-011-3/+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>
* | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I9d7f513b1e47c5ebd3d0bd0bf0f7647c175d096e Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Save opaque images as opaque TIFF filesAllan Sandfeld Jensen2014-07-041-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Suppress "sequential device" warning for other files.Alex2014-06-251-4/+7
| | | | | | | | | | | | | | | | | | Hides "sequential device" warning for non-icns data. Task-number: QTBUG-39838 Change-Id: Ib09f519de04a53e9d685b14412c40ee0077fb3d9 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devSergio Ahumada2014-06-141-0/+9
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iea93fd02ca221e7b36328245f593cbe48cd2771c
| * Make QWebpHandler::write() work on big endian systemsv5.3.1stableDmitry Shachnev2014-06-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we convert image to Format_ARGB32. This means that on big endian systems the order of bytes will be (0xAA, 0xRR, 0xGG, 0xBB). However, in WebP library there is no function to import bytes in ARGB format. This commit makes us use Format_RGBA8888 and WebPPictureImportRGBA on big endian systems, which will make the function work correctly. Change-Id: I5f347f3ec66f0a57df0d40d4900b1573f9400506 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-241-21/+0
|\| | | | | | | Change-Id: I6a7d0055183a4bf7f850667d11a7dd0f477f4aa9
| * Remove unused and unlinked qdocconf file from the project.v5.3.0-rc1v5.3.0-beta1v5.3.0Jędrzej Nowacki2014-03-181-21/+0
| | | | | | | | | | Change-Id: I2d0b60c47d92ba82e04a0d90877bda6b287f5a85 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-101-0/+1
|\| | | | | | | Change-Id: I7a67d831d24b298dbf48a6cac2c5f7e519a4616a
| * Added webp information in doc and changelogv5.3.0-alpha1Liang Qi2014-02-211-0/+1
| | | | | | | | | | | | | | Change-Id: I1287608e914598c58acff70a47f71cc0bf36f094 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Add support for reading icon variants in ICNS pluginAlex2014-02-262-4/+45
|/ | | | | | | | 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-136-1/+421
| | | | | | | | | | | | | | | 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>
* Adding libwebp: Patches to libwebp 0.4.0 for Qt usageLiang Qi2014-02-132-0/+171
| | | | | | Task-number: QTBUG-14205 Change-Id: Id7c3f4d9398b613a18033d8f3f624448f31ce33d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Adding libwebp: Adding clean copy of libwebp 0.4.0Liang Qi2014-02-1397-0/+36991
| | | | | | | | | | | | | This commit imports libwebp 0.4.0, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. The patches required to build it in Qt will follow in separate commit(s). Task-number: QTBUG-14205 Change-Id: I747918fe2a07716f66cffb795129f7aa5e067759 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add JPEG 2000 plugin.Jake Petroules2014-02-119-5/+1428
| | | | | | | | 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>
* Use RGBA8888 format to simplify TIFF writingAllan Sandfeld Jensen2014-02-102-22/+3
| | | | | | | | | | We write TIFF files using big-endian RGBA, by using the RGBA8888 QImage format we can remove the manual conversion done in qtiffhandler. Change-Id: I4a7f4810ce4332d1608813d9cd6371bc13d94df0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Replace win32-g++ with mingw scopeKai Koehne2014-02-073-4/+4
| | | | | | | | | | Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: I90c319bdda6b710bce4d2d883736716a70760127 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add configure test and build system files for JasPer.Jake Petroules2014-01-301-0/+65
| | | | | | Change-Id: Id3db7c5e7b3329adbea62c9d95323ead4e8a783f Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 14:17:05 +0000