summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Bump versionFrederik Gladhorn2014-08-291-1/+1
|/ | | | Change-Id: Idd9e1d79ccde1c4fe4d5bda0007f6a4c357e5840
* 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>
* Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | Change-Id: I76c25993967a23329da5983a13a6198662566c58
* 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>
* 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>
* 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>
* 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>
* | Fix writing images in DDS handlerABBAPOH2013-12-022-7/+37
| | | | | | | | | | Change-Id: If433528eb4cfa7448f171e083dd2bb559dbc2f4a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Add support for QImageIOHandler::Size option in DDS handler.ABBAPOH2013-12-022-0/+23
| | | | | | | | | | Change-Id: I7c9fc452142d9827269ebf9b6b2778c2b0eb55da Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Add QByteArrayliterals to QDDSHandlerABBAPOH2013-12-022-8/+8
| | | | | | | | | | | | Change-Id: I9785fecffad5c82bacb846ba1d4dcdfda9af168b Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix capabilities in DDS image handler.ABBAPOH2013-12-011-2/+4
| | | | | | | | | | Change-Id: Ic214fe9951bc8739cae4a8cd2517115a34ab80ba Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Whitespace fixes in DDS image handlerABBAPOH2013-12-011-5/+5
| | | | | | | | | | Change-Id: I6da5d294065971f69cf90c285b2a6440502dc147 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-291-0/+2
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib695c2e2c8629e1947c24ba6510ecb4194b949dc
| * Bump MODULE_VERSION to 5.2.1v5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | Change-Id: I979cdf4dd3f1a8d2e3b73c9fce8507a4ce97198d Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Recognize newer libmng versions in config testaavit2013-11-251-0/+2
| | | | | | | | | | | | | | | | | | libmng 2.0.x has been released and is compatible and usable, but since it no longer provides a VERSION_MAJOR macro, the config test would fail. Task-number: QTBUG-34894 Change-Id: I106aa258de0851af01d1bb016c2971dd8e30fd24 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Add Direct Draw Surface plugin to documentation and changelog.Jake Petroules2013-11-262-0/+23
| | | | | | | | | | Change-Id: I866c65ecfbbe85822f8b8e9233098f56cb21d405 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Add Direct Draw Surface pluginABBAPOH2013-11-2662-2/+2255
| | | | | | | | | | | | Change-Id: I8dfa6001c1aae2dcb5f2e6e0bfd142ef1f9dddbc Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-081-1/+1
|\| | | | | | | Change-Id: I93b2a2e074fc7163b77e3f0edd826266819a2c36
| * Doc: Updated url variable in qdocconf files.v5.2.0-rc1v5.2.0Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I76ca42d3d9f125588ae72003d85b27ef1f9cee2d Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-113-4/+6
|\| | | | | | | Change-Id: I89d0db8f8928e8763b3a9e6fa9ae1cda6e18a76f
| * Fixes windows ce buildv5.2.0-beta1Bjoern Breitmeyer2013-10-073-4/+6
| | | | | | | | | | | | | | | | | | | | | | The windows file seems to handle ce too in the new version of libtiff. Only the <sys/types> include and the not defined error handle were a problem. The error handler ifndef _WIN32_WCE can be removed as Qt builds libtiff without the gui integration. Change-Id: Idb025f64fc31d580566d8ce248137e57d01e96b2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Bump qtimageformats version to 5.3.0Sergio Ahumada2013-09-241-1/+1
|/ | | | | Change-Id: Ia8ccce11e5b356456e04a7f47a119caa3bbf00dd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1Frederik Gladhorn2013-08-141-2/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | The inline keyword needs to be defined to __inline for MSVC when compiling C files. The patch removing the redefinition of inline does not work with the updated library, instead we resurrect the ifdef for MSVC only. Conflicts: src/3rdparty/libtiff/libtiff/tif_config.h Change-Id: I22bbaf3627fdb4f3dc60c9cd0f8d3282efc5bd2c
| * Make libtiff link on OS X 10.9old/5.1Gabriel de Dietrich2013-08-051-9/+0
| | | | | | | | | | | | | | | | | | Undefining the 'inline' keyword doesn't look very wise nowadays, and it did cause duplicate symbol erros at link time when linking against the 10.9 SDK. Change-Id: Ie6f8639fb920e57289c7d0ad8952603abcfe7377 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-08-052-1/+30
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib841f2c7f6c0819ff9b41a11249331ca585d6d60
| * fix shadow build with -qt-zlib and pre-generated headersOswald Buddenhagen2013-07-301-1/+5
| | | | | | | | | | | | Task-number: QTBUG-32641 Change-Id: I4d0b4df50b652cf47e5f0b75b6d3c1f714414007 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+25
| |\ | | | | | | | | | Change-Id: I64a312169c1234a0a26a582bde2c08bb7e9c718e
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | | | | | | Change-Id: Ie1c9020281ce5e0d591c0bc9393d4fe0babd6745 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/ | | | | | | | | Change-Id: I59c494d5a9e95296ce403d3feb0167e8d3fd0b94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 00:09:38 +0000