summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Support custom ZLIB library name(s)5.5Mike Gelfand2016-01-301-1/+4
| | | | | | | | This is already the case for qtbase and qtwebkit, while here only hard-coded "zdll.lib" was used on Windows. Change-Id: I6592ed8cfc667db58cb7ab65f97f00fc83e8e7d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* DDS: Bail out on failure to detect the format.Friedemann Kleint2015-10-201-0/+2
| | | | | | Task-number: QTBUG-48851 Change-Id: Iaf2c2b36539412a341edb721a135f36a97be4b83 Reviewed-by: aavit <eirik.aavitsland@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>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-190-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I539e7abf49a6b14c31bf1c8ca440afcdbfb5164e
| * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | Change-Id: Id5669f0ab9cb3c27e57d9fc39fa1bd62d793b6db
* | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | 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>
* | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | Change-Id: I1a0d7f96adb698c0012c1b41771e8bf16b1ddec9
* | Add changes file for 5.5.0 releasev5.5.0-rc1v5.5.0Eirik Aavitsland2015-06-031-0/+28
| | | | | | | | | | Change-Id: I56eb43d6fe834d5fba90e78267290fd73290fd5b Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Handle Grayscale8 TIFFsAllan Sandfeld Jensen2015-05-292-18/+45
| | | | | | | | | | | | | | | | 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-192-116/+97
| | | | | | | | | | | | | | | | | | | | | | | | 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-122-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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-043-88/+153
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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-1147-313/+313
| | | | | | | | | | | | | | | | | | | | 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.4' into devFrederik Gladhorn2015-01-191-0/+26
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I72c06814a05ac09cb498d4af89dc9e7d791e6cce
| * Bump versionOswald Buddenhagen2015-01-161-1/+1
| | | | | | | | Change-Id: If3598afc841e6109716921aea3b72a10d423f52e
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4v5.4.1Frederik Gladhorn2014-12-171-0/+26
| |\ | | | | | | | | | Change-Id: Ifa04cb59a4b0985e6261678c0d0b62438a50e91c
| | * Added changes file for 5.4.0v5.4.0aavit2014-11-271-0/+26
| | | | | | | | | | | | | | | Change-Id: Id9672b324af8aa96d79d534b616520049b6e77e3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I24c15b9824a6a2a68d1cb3d0aef0650e024164d6
| * | Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | | | | | Change-Id: Idc22f4e16ba0977a48a1c29be380f999dc972f8d
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-278-13/+27
|\| | | | | | | | | | | Change-Id: I8b76d2098cc2d8bca5a63798d53182144d6a4442
| * | Don't try to use incompatible system libwebpaavit2014-11-251-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Make the config test check compatibility more thoroughly. Task-number: QTBUG-42850 Change-Id: I0771ee633868ad9a7ef03eee2434504d40bc9ce4 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-217-13/+18
| |\| | | | | | | | | | Change-Id: I9002ef6585513ebfb9e641e890f8b0e855c67a08
| | * 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>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-211-1/+2
|\| | | | | | | Change-Id: Id484a6b43e3ee15e06e8291ae69f717b855a2fe5
| * 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.4' into devFrederik Gladhorn2014-10-205-7/+0
|\| | | | | | | Change-Id: Ie20395da30acdbf0ac42089208046f0526fd5fb7
| * 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>
* | | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-092-0/+3
|\| | | | | | | | | | | | | | | Change-Id: I7672ca8c233430d2e5e0627f55c782ea123d93fa
| * | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 23:45:20 +0000