summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added changes file for 5.4.0v5.4.0aavit2014-11-271-0/+26
| | | | | Change-Id: Id9672b324af8aa96d79d534b616520049b6e77e3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-145-7/+0
|\ | | | | | | Change-Id: I96f7e13e5a6f65dae1a9f7717e30021f81cf1e81
| * Merge remote-tracking branch 'origin/5.3.2' into 5.35.3Frederik Gladhorn2014-09-175-7/+0
| |\ | | | | | | | | | Change-Id: Ief8c794e676fae84b5de6ad241646a43d898c023
| | * Remove some material with questionable copyrightv5.3.2Lars Knoll2014-09-035-7/+0
| | | | | | | | | | | | | | | Change-Id: I81bc4d678f717ccc73b0199d3dd0ba0d73be716d Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | Fix libmng test.v5.4.0-beta1Lisandro Damián Nicanor Pérez Meyer2014-09-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmng pulls in libjpeg. In turn libjpeg requires that code that uses it should include stdio.h [0]. [0] <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=461602#10> So adding the corresponding include before libmng solves the issue. Change-Id: I7cfbda727ed5b71b668d6597358a5e9c7d8918bb Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
* | | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4453973e64dc6488fce35b2eccf98ead5d1006e8
| * | Bump versionFrederik Gladhorn2014-08-291-1/+1
| |/ | | | | | | Change-Id: Idd9e1d79ccde1c4fe4d5bda0007f6a4c357e5840
* | 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-2547-1496/+943
| | | | | | | | | | | | | | | | | | | | - 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-083-2/+154
| | | | | | | | | | | | 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-294-3/+6
|\| | | | | | | Change-Id: I15c1f7d4fd700c04f3f27720fc79abd3827eeeed
| * Fix DDS image writingaavit2014-07-014-3/+6
| | | | | | | | | | | | | | | | | | 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-042-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-260-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia2ad5d124b5ade98463e2304a96458d5d9fb9a59
| * Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | | | | | Change-Id: I76c25993967a23329da5983a13a6198662566c58
* | 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>
| * Bump MODULE_VERSION to 5.3.1Sergio Ahumada2014-04-221-1/+1
| | | | | | | | | | Change-Id: If8c86e33a045ea50d957a2a68c204a8de2fad65c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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-102-0/+2
|\| | | | | | | Change-Id: I7a67d831d24b298dbf48a6cac2c5f7e519a4616a
| * Added webp information in doc and changelogv5.3.0-alpha1Liang Qi2014-02-212-0/+2
| | | | | | | | | | | | | | 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-265-4/+47
| | | | | | | | | | | | | | | | 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>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: I99032534d75746d28f68bba80bcbda63eac7cb11 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Added webp image format pluginSteven Yao2014-02-1319-2/+618
| | | | | | | | | | | | | | | 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-1116-6/+1533
| | | | | | | | 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-075-6/+6
| | | | | | | | | | 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-304-0/+125
| | | | | | Change-Id: Id3db7c5e7b3329adbea62c9d95323ead4e8a783f Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Import a copy of JasPer 1.900.1 for use by the JPEG 2000 plugin.Jake Petroules2014-01-30116-0/+42390
| | | | | | Change-Id: I85348aa66f8c3c145bbfd125f557d6a247046d8f Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Exclude non-supported imageformats for WinRTMaurice Kalinowski2014-01-281-0/+5
| | | | | Change-Id: Icaf64ef0b949e75402c1440826f24e42de96df62 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-170-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2268e648a3d65f8ff6dbc0e954e0729a2e751664
| * Bump MODULE_VERSION to 5.2.2old/5.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: Ibafe0f44c0235517bf8b7ac85f4baa2d3a728f34 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Refactor ICNS plugin to prepare it for icon variants supportAlex2014-01-142-142/+189
| | | | | | | | | | | | | | Change-Id: I8bc799ade204072bdc169180154c2c2b021fd44e Reviewed-by: Ivan Komissarov <ABBAPOH@me.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Fix reading palette images in DDS handler.Ivan Komissarov2014-01-136-4/+41
| | | | | | | | | | | | | | 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-1724-2/+1384
| | | | | | | | | | | | | | | | | | 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 QDDSHandler::canRead to return false in case of a scan error.ABBAPOH2013-12-161-1/+5
| | | | | | | | | | | | | | Change-Id: If776b122c90d79d430916677a46684770870956a Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Alex Char <prevedtest@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Do not try to rescan device in case of an error in DDS plugin.ABBAPOH2013-12-162-10/+18
| | | | | | | | | | | | | | Change-Id: I64b49294476fc3bbf77620d839b88b0ecea68e23 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alex Char <prevedtest@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Fix build of the DDS plugin without QDataStreamABBAPOH2013-12-135-1/+21
| | | | | | | | | | Change-Id: I854c3bd82f244a6c45d91b08c3f1271538fd536a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Remove main.h in DDS plugin.ABBAPOH2013-12-133-71/+12
| | | | | | | | | | Change-Id: I86b805d60755c463c321146e923469a9d7b006e4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix MSVC warnings about scopes.Friedemann Kleint2013-12-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | qddshandler.cpp(483) : warning C4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used qddshandler.cpp(477) : definition of 'i' ignored qddshandler.cpp(467) : definition of 'i' used qddshandler.cpp(486) : warning C4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used qddshandler.cpp(477) : definition of 'i' ignored qddshandler.cpp(467) : definition of 'i' used Change-Id: Ib911578900f012db20d9e50bdffa5d1ca9896a7e Reviewed-by: Ivan Komissarov <ABBAPOH@me.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 05:22:05 +0000