summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-155-120/+168
|\ | | | | | | Change-Id: Ib8c81669bd2f83c829fab625623452e4891b2356
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-011-3/+8
| |\ | | | | | | | | | Change-Id: Ia70c3f78bf0801363b757e164bd66767fb77f9a2
| | * Fix JasPer version checkv5.14.0-beta1v5.14.0-alpha1Joerg Bornemann2019-09-191-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compile test for JasPer tried to check for a certain version number at run time, which is pointless, because we never run this test. Turn the run-time check into a compile-time check. Change-Id: I7c9de67a35edadf6a13b32b0faf48ac728a80fc0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev"Simon Hausmann2019-09-192-4/+2
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-09-182-4/+2
| | |\ | | | | | | | | | | | | Change-Id: I1b25b31fb8e8cd8f3e73c51cc0e4a233b6ef3363
| | | * Merge remote-tracking branch 'origin/dev' into wip/qt6Simon Hausmann2019-09-165-26/+109
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6cb3354f6a16aa94a7e463db6ac8bf941b0c500f
| | | | * Merge remote-tracking branch 'origin/5.14' into devQt Forward Merge Bot2019-08-291-11/+14
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: Ie8ed91a581296c126ce0132e8860289e4b673000
| * | | | | Fix and re-work compile testsJoerg Bornemann2019-09-181-97/+59
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compile tests were seriously broken, and we didn't notice, because configure leniently ignores the second level "test" object and the inline sources provide the absolute path. Merge the 2nd level test objects with the right ones. Remove superfluous label entries. Remove superfluous qmake entries. The inline sources already provide the right -l argument. Remove superfluous return statements. The generated main function already returns 0. Remove superfluous "type" entry, because "compile" is the default anyways. Note that the jasper version test is bogus, because these are compile tests that are not actually executed. The reference to JAS_VERSION is kept to test for existence of this define. Fixes: QTBUG-78473 Change-Id: I1d4fa634e29329cfc34c0a2f78b2eb730ef84d50 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Fix build after QColorSpace API changesTor Arne Vestbø2019-09-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff3186cf4eccae5fc7e7e3c55c5e6eb662be9519 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | | Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-042-14/+55
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | | | | | | | | | | | | | This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: Ied7ff6d61393b0e6db5c5984d8ab735ddaffad72
| | * | Support writing WebP color space profilesAllan Sandfeld Jensen2019-08-212-14/+55
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d9473c2866d9792cd8752816a291be04e39ec19 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | | Fix Android multi ABIs compilationBogDan Vatra2019-08-281-11/+14
| |/ / | | | | | | | | | | | | Change-Id: I983e2559d27ab5778f0af16f659786c0d78f4338 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | Read color space from WebPAllan Sandfeld Jensen2019-08-192-0/+18
| | | | | | | | | | | | | | | Change-Id: If1b9645fe07fb2cf15dbf2421d6c66b20f02bdb6 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | Read/write ICC profile in TIFF pluginAllan Sandfeld Jensen2019-08-171-1/+18
| | | | | | | | | | | | | | | | | | | | | Adds reading and writing of embedded color spaces on the TIFF plugin. Change-Id: I53e8a16ff65f7986e9d51a5b543335e27b43e346 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | Do not try to write too large WebP imagesAllan Sandfeld Jensen2019-08-171-0/+4
| | | | | | | | | | | | | | | | | | | | | The WebP encoder doesn't check so we end up with undefined behavior. Change-Id: Id3a64b2be50684d07e799f97f64481ba57c02ffb Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Regenerate projects before mergeAlexandru Croitor2019-10-1518-44/+32
| | | | | | | | | | | | | | | Change-Id: I9a889214e310b95ca1418925d6413602f9e00cea Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-08-1565-480/+596
|\ \ \ | | |/ | |/| | | | Change-Id: Idf48bddde98d108d3692eddb8971affcc691a614
| * | Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-08-1160-348/+563
| |\| | | | | | | | | | Change-Id: Ic0596108d4f3af40f68e07b53a436eeb07fc9f55
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-031-3/+3
| | |\ | | | | | | | | | | | | Change-Id: If594ae6ab8040f90e5ebe754854b412073b734ec
| | | * Reapply: Fix building with clang_clAllan Sandfeld Jensen2019-07-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix was mistakenly overwritten by the recent 1.0.3 upgrade. Change-Id: Ifcfeeac075d97d770de471380c506fb739f0b52a (cherry picked from commit dbfcea2a638d9223bb8d4d9ffc63b0d294b9f97d) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-2346-346/+532
| | |\| | | | | | | | | | | | | Change-Id: I88bbc7ca2384e7fcafeacf72d0b9a74b9c1cc43e
| | | * Update bundled libwebp to version 1.0.3André Klitzing2019-07-2246-346/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.3 Change-Id: I7aef89e209923af0e516024c26ebce4a8158d4d1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I1cbe0e8a7ba8c7c53e16747c8a48d8bdf2b2bebf Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * | Fix compilation with disabled deprecated APIsSona Kurazyan2019-07-0812-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QImageIOHandler::name() has been deprecated since 5.13, but its overrides weren't. Enabled compilation of the overrides only when the QImageIOHandler::name() is compiled. Task-number: QTBUG-76491 Change-Id: I913f03f730969ea88864a5a08afe50c4eac533ca Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-142-5/+9
| | |\| | | | | | | | | | | | | Change-Id: Ia0a5fe32ec96c73758933b319f5cb8f22cc9f344
| | | * Fix feature and library checks for tiff and mngJoerg Bornemann2019-05-132-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This amends commit a33e3aea. Change-Id: I03304f5bf300e5e52476c3f3d6b06b0815009720 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-06-172-4/+2
|\| | | | | | | | | | | | | | | Change-Id: I99e95abde299432d6ea63eabd8d1f0b5b82a3039
| * | | Fix qt6 buildAlexandru Croitor2019-06-142-4/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumped version. Adjusted code for removal of the TransformedByDefault enum. The enum is removed in Qt6 code, so existing tests need to be adapted to call setAutoTransform() for plugins that usually had autoTransform enabled by default. The new Qt6 default is that all plugins have autoTransform disabled by default. Change-Id: Ifa45375a4bc42ba1d863cb96af16776ea6dd0632 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Regenerate qtimageformatsAlexandru Croitor2019-06-0618-0/+57
| | | | | | | | | | | | | | | | | | | | | Ends up adding plugin class names and types. Change-Id: I3824a3a00cf6f56442a0494effcf641e22b3dcc7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Fix qtimageformats buildingAlexandru Croitor2019-06-062-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some feature conditions were incorrect. Added forgotten FindWrapWebP.cmake file. Protect call to qt_find_package ZLIB. Change-Id: I033d38e4f69e94f7b72346b49bf6de4b2dbde8e0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Initial CMake PortAlexandru Croitor2019-05-2820-0/+573
|/ / | | | | | | | | | | | | | | | | Port 90% of imageformats to be built with CMake. Missing support for mng plugin and documentation. Change-Id: I1d7e4b93c6f8446468f00dbf0663a6a4ec8c9774 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3Qt Forward Merge Bot2019-04-161-0/+1
|\| | | | | | | Change-Id: I8ad02040bdd3ce055c48c761b08f9ac1f742a6fa
| * Fix -no-gui buildJoerg Bornemann2019-04-121-0/+1
| | | | | | | | | | | | | | Change-Id: I57639389880e5c73025ffe3db9f411fc5b0e78e8 Fixes: QTBUG-75113 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-04-093-10/+2
|\| | | | | | | Change-Id: I02bc865209f0092c68e5be1542f54e605c517c58
| * Remove the QT_NO_IMAGEFORMAT_{TIFF|WEBP} definesJoerg Bornemann2019-04-023-10/+2
| | | | | | | | | | | | | | They are #undef'ed anyway. Change-Id: Ic1cb3c09b5849f16115d8514fef471825d564f2c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-026-14/+236
|\| | | | | | | Change-Id: Idd134e350e760a0237dce4ef00d10e1c35dbeb67
| * Move qtimageformats over to the new config systemLiang Qi2019-04-025-11/+233
| | | | | | | | | | | | | | Task-number: QTBUG-44318 Task-number: QTBUG-62259 Change-Id: Ide5c28015c46b12ee3f21d06badd69db8bed1281 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Fix building with clang_clAllan Sandfeld Jensen2019-04-011-3/+3
| | | | | | | | | | | | | | | | | | Clang reports itself as MSVC but doesn't allow intrinsics to be used unconditionally independent of command-line flags like MSVC does. Fixes: QTBUG-68551 Change-Id: I65d1ee1aa5c02b7c3a25c10c69c3d5e88129b858 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-275-49/+208
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie44fe655653166bf5a4436aedd80d060afa45d5a
| * Heic handler: fix orientation and other image propertiesEirik Aavitsland2019-03-264-48/+207
| | | | | | | | | | | | | | | | | | | | The mac heic handler lacked support for any meta-data i/o. Most notably, the image orientation proprty was ignored, so images read in could be wrongly oriented. Fixes: QTBUG-73415 Change-Id: I779f91dc28c7441b124aab4557e1abcd3e69fde9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * tiff handler: fix compilation failureEirik Aavitsland2019-03-251-1/+1
| | | | | | | | | | | | | | | | | | Avoid using the tmsize_t type, since it may not be defined. Fixes: QTBUG-74283 Change-Id: I63a496173ec08c6ceac569c516d11a4711e32649 Reviewed-by: Richard Öhlinger <richard.oehlinger@adbsafegate.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-0921-165/+530
|\| | | | | | | Change-Id: If83b53844d5110c40d94a2e7a6dbfa1f09604f46
| * Update bundled libwebp to version 1.0.2André Klitzing2019-02-0421-165/+530
| | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.2 Change-Id: I12e1557cef6e592c8c2ca417ef87f6df35a7b410 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Add Grayscale16 support to TIFFAllan Sandfeld Jensen2019-01-031-2/+8
|/ | | | | Change-Id: I927d9ab0af78baf90d8fd8d44088218dff0e7082 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-11135-864/+1687
|\ | | | | | | Change-Id: Ib84ba922bb21f9e6c52c3096e7ae0fc10025c202
| * Update bundled libtiff to version 4.0.10Eirik Aavitsland2018-11-1967-469/+987
| | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.10 Change-Id: Ib1908d09fc5847381cb03418de878fafd2001a30 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update bundled libwebp to version 1.0.1André Klitzing2018-11-1968-395/+700
| | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.1 Change-Id: Ieccb9f7c0023e6f6591b6093eead9f6940be3210 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-271-5/+14
|\| | | | | | | Change-Id: I56fb4e7a178ac79c75a846d9a7bcd8f1f3533673
| * tiffhandler: improve stripsizeEirik Aavitsland2018-10-251-5/+14
| | | | | | | | | | | | | | | | | | | | libtiff's default stripsize is tiny (8KB), so splitting the image into such strips on writing would significantly hurt the compression rate. Aim for 4MB strips instead. Task-number: QTBUG-70820 Change-Id: I07a9a8c81edf62e802b4ae8d6729a76df15e42ac Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove bundled, unmaintained libjasper source codev5.12.0-beta3Eirik Aavitsland2018-10-15121-42492/+7
| | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] The unmaintained bundled libjasper has been removed. Building the jp2 handler will require libjasper to be present as a system or external library. Change-Id: Ic48cc6021fc5fb64fb369eb9621fd7a811e8e9f7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 23:34:20 +0000