summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove bundled, unmaintained libmng source codev5.12.0-beta2Eirik Aavitsland2018-10-1280-99057/+7
| | | | | | | | | [ChangeLog][Third-Party Code] The unmaintained bundled libmng has been removed. Building the mng handler will require libmng to be present as a system or external library. Change-Id: I4a4805fa3f3088b5d581b92bfeabba7978bac5f7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* tiff handler: ensure valid value of the compression optionv5.12.0-beta1Eirik Aavitsland2018-09-171-1/+1
| | | | | | | | Bound the value of the compression setting to the possible values of the QTiffHandler::Compression enum. Change-Id: I50e1eb8014654d8b4403d7f06e6099661e57562c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-011-0/+8
|\ | | | | | | Change-Id: I04f8b27d37b677f15853ba84017d3f2a36368422
| * TGA handler: check for out of range image sizeEirik Aavitsland2018-08-281-0/+8
| | | | | | | | | | | | | | | | Make the decoder fail early to avoid spending time and memory on attempting to decode a corrupt image file. Change-Id: Iac35e72de743f412a65d11c58fe7faa275dc4e41 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Add RGBA64 format support to TIFF pluginAllan Sandfeld Jensen2018-08-232-12/+104
| | | | | | | | | | | | | | TIFF is one of the primary formats for HDR images. Change-Id: I5310b5c9a625fd3e759e5120be6ba547c633c81c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-5/+10
|\| | | | | | | Change-Id: Ieebdb63bc396bb683b85e3d07ec9c5d78bd30f69
| * Fix tiffhandler: ensure saved tiffs have suitable ROWSPERSTRIP tag setEirik Aavitsland2018-06-061-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing an image without compression, libtiff will automatically store it in strips of default size, and add a ROWSPERSTRIP tag accordingly. However, if compression is enabled, libtiff does not do this. The lack of this tag may create trouble for readers. Fix by explicitly setting the tag in all cases. [ChangeLog][TIFF] Ensure saved tiffs have suitable ROWSPERSTRIP tag set Task-number: QTBUG-68609 Change-Id: I838c83be25158d7f13e220098e960010b8cb2789 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | webp handler: improve quality-level handlingEirik Aavitsland2018-05-301-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | In lossless mode, libwebp interpretes the quality setting as a compression-effort setting instead. The code used to set it to 100 (maximum), which could lead to unreasonable compression times (several seconds for a small image). Instead set it to libweb's own default value. Also, since the alpha channel compression has its own quality setting, make sure it follows the main quality/effort setting. Change-Id: I595d42c61f61c9932b27b185745bde6e7cfb3526 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | webp handler: support alpha-less reading and writingEirik Aavitsland2018-05-281-14/+13
|/ | | | | | | | | | | | | | Webp files can be with or without alpha channel. The handler would ignore this and read all as Format_ARGB32 images, and write all as having alpha, in both cases losing that important bit of information. As a driveby, simplify the endianness handling in write(). By always converting the source image to an endianness-independent QImage format, no special handling is required. Task-number: QTBUG-48628 Change-Id: I624ed72b18a8b59a542979efcb4e8ff81214e0d7 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update bundled libwebp to version 1.0.0Liang Qi2018-05-2256-858/+1693
| | | | | | | | | | | | | | | This commit imports libwebp 1.0.0, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. Upstream changes since 0.6.1 have been merged in. Also updated version in qt_attribution.json. [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.0. Change-Id: Ia30ccc90286d5dd3e48e091f101f1cae84785150 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Update the bundled libwebp to version 0.6.1v5.11.0-beta4Eirik Aavitsland2018-04-12161-5553/+7243
| | | | | | | | Upstream changes since 0.6.0 have been merged in. Also updated version in qt_attribution.json. Change-Id: I6f46bdfe2dd7288dbe61c4d7924309bb435e3928 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Doc: Set empty module header for the documentation projectv5.11.0-beta3Topi Reinio2018-03-281-0/+3
| | | | | | | This prevents a QDoc Clang C++ parser warning about a missing header. Change-Id: Id14b17de72488a12108b583ed0673d0451ff5e15 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-4/+4
|\ | | | | | | Change-Id: Ifbf48df8a449de12d91631d44cab0320dfd5f699
| * Add fix for CVE-2017-18013 of libtiffv5.10.1André Klitzing2018-02-091-4/+4
| | | | | | | | | | | | | | | | http://bugzilla.maptools.org/show_bug.cgi?id=2770 Change-Id: I936b463b37fa922930cf122cfddf842d81ee796e Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 25d7e0440f091b39c2865187eb0630045fa20e46)
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-1517-54/+103
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If4baad0b1949c1c8f7157c213fc492775053ae0b
| * Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-1517-54/+103
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I827727fde51a71cbef5d61fb6cc2cd45d5e3bd7c
| | * Make the native darwin image IO work on iOS tooEirik Aavitsland2017-12-141-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The functions used for converting between QImage and CGImage were not available on iOS. Replace with newer conversions functions which are. Task-number: QTBUG-64722 Change-Id: I3f62d3ccabd103e5b9d4828e8079d94587472872 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | * Update bundled libtiff to version 4.0.9André Klitzing2017-11-2214-31/+93
| | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.9 Change-Id: I64a56d9b01cc1bb102a3368269ae9915fac5a051 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * WebP: Fix wrong default quality level for writingEirik Aavitsland2017-11-162-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a negative (i.e. illegal/unset) quality value was set to the WebP handler, it would just bound it to 0 (minimum quality level). This would happen on every save where no explicit quality level had been requested on the QImageWriter. Fix by copying the jpeg handler's behavior: If a negative value is set, use the default level (75) when storing. [ChangeLog][WebP handler] Fixed default quality level for writing Task-number: QTBUG-64437 Change-Id: I0f1cabba6cea6851c6a813bf5bf7ab8e8c49ddfb Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2047-474/+2618
|\| | | | | | | | | | | Change-Id: If0c8e712f7521483df688ae9d33adea8b5fdaae5
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3047-474/+2618
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I84737121b8915a6c358ad92246984749e2719bed
| | * TGA: Fix clazy-copyable-polymorphicFriedemann Kleint2017-10-191-0/+4
| | | | | | | | | | | | | | | Change-Id: Iba0631701fbecdd66ffa1d12c57387d76aa65475 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Update bundled libtiff to version 4.0.8+Eirik Aavitsland2017-10-1944-468/+2608
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the bundled libtiff to release 4.0.8. In addition, since after that release a number of security-related fixes has been added to the upstream CVS repository, this commit comprises the upstream changes of libtiff until 2017-10-10. (Corresponds to commit 46195f7 in the unofficial mirror at github.com/vadz/libtiff.git.) [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.8+ Change-Id: I9f45387ab48383ef2635d60aeda5c74828f1a6fc Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Fix outdated FDL license headerKai Koehne2017-10-171-5/+5
| | | | | | | | | | | | | | | Change-Id: I1e024810b9c5a9fc32986507d263f8b9727f2315 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Avoid returning void expressionAndré Klitzing2017-10-061-1/+1
| | | | | | | | | | | | | | | Change-Id: I32dd4ece07c0ff4ef882fffe69afbe2f4a818a96 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Add native Darwin handler for the HEIF (.heic) formatEirik Aavitsland2017-10-3010-7/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds basic support for still images encoded with the HEIF standard introduced in macOS Sierra and IOS 11. Uses the Core Graphics Image I/O Framework as codec backend. Reuses the helper class from the macjp2 handler. Change-Id: I5f0c7891b189a916cccd2c27eacbac12416ce209 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | Check for not clang when checking for MSVCAllan Sandfeld Jensen2017-09-291-1/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63512 Change-Id: I9cd97dc178c108dfca0b1ee12dd18b78497603d7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-4/+4
|/ / | | | | | | | | Change-Id: Iba9c9b77bea8c4ec6915a0cac6aa9c84aaa77dca Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix deprecation warningsv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Allan Sandfeld Jensen2017-08-071-1/+1
| | | | | | | | | | | | | | Use new sizeInBytes() method. Change-Id: I3fa5969ac04e2edb87a06f132dc0b60e65718b81 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-07-042-0/+12
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I55c144a1d0579aa19691c44c4f8ef8bf702189cb
| * WebP: respect the frame dispose method for animationsJ-P Nurmi2017-07-031-0/+4
| | | | | | | | | | | | Task-number: QTBUG-61640 Change-Id: I9d0bfbafe15df338355cf2f5c77c2d4f8f00d27f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Fix QWebpHandler::canRead() to take animation frame count into accountJ-P Nurmi2017-07-031-0/+4
| | | | | | | | | | | | Task-number: QTBUG-61641 Change-Id: I24a139cc75141a588f2ed2558da85cd2f8391af9 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Doc: Add a note about the DDS handler not being built by defaultLeena Miettinen2017-06-121-0/+4
| | | | | | | | | | | | | | | | | | ...for security reasons. Task-number: QTBUG-59955 Change-Id: I74e25d7c46490e476186b486b8c1845e425964f9 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | qtiffhandler: correct types for height and widthJerome Duval2017-06-141-2/+2
|/ | | | | | | | qMin() was used with quint32 and uint32. This fixes the build on Haiku. Change-Id: I193f561b9a63ffe9ee5ae991084118a821e3f22d Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Remove DDS from image format docsAlan Alpert2017-05-041-1/+0
| | | | | | | | | The plugin has been removed from the build (since 5.8) and is now unmaintained. While keeping the code around for adventurous users makes sense, people who rely on reading the docs should now assume it is gone. Change-Id: I9df73d899e49cc94fb9316effa80778adbda5e6d Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Support for Q_OS_ANDROID_EMBEDDED and android-embedded buildsOtto Ryynänen2017-04-252-3/+3
| | | | | | | | | | | | The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. Those flags are set in mkspecs when building for embedded Android. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I8d139b6d7b61c00ad44079cbfa6e5c77e8618a7b Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Extend support for tiled tiff files to all color formatsv5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Eirik Aavitsland2017-03-161-94/+75
| | | | | | | | | | | | | | | This commit extends the recently added support for tiled tiff images of color index format to also cover grayscale and mono images. RGB images were already covered, since the libtiff API used for those handles tiled images transparently. This commit also simplifies the tiff read() function by sharing common code among the different formats. [ChangeLog][TIFF] Extend support for tiled tiff files to all color formats Change-Id: I13f94bbca65dd6a35384a415906034e245ad8b79 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add support for tiled, color indexed tiff filesEirik Aavitsland2017-03-151-2/+29
| | | | | | | | | | | | For color index images, the tiff handler uses scanline based reading. The tiff decoder does not support that if the image is stored in tiled format. This commit adds tile based reading for such cases. [ChangeLog][TIFF] Added support for tiled, color indexed tiff files Task-number: QTBUG-12636 Change-Id: Ic759903c75c8252267429f01e3dd9706fc516f8f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Build fix for -no-feature-regularexpressionPaul Olav Tvete2017-03-151-1/+3
| | | | | Change-Id: I69942195d5208985d75333a13ed0ac5ae8f595d2 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Bundled libwebp updated to version 0.6.0Liang Qi2017-03-13146-6482/+14025
| | | | | | | | | | | | | | | | | This commit imports libwebp 0.6.0, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. Upstream changes since 0.5.1 have been merged in. Also updated version in qt_attribution.json. Conflicts: src/3rdparty/libwebp.pri src/3rdparty/libwebp/qt_attribution.json src/3rdparty/libwebp/src/webp/config.h Change-Id: I001aa7a3fabf0130b54f9005c23aa822bc1d0ec1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-06116-2293/+5670
|\ | | | | | | Change-Id: I9cf7f04769944935d7b836453c7982839857a909
| * Fix include order5.8Ulf Hermann2017-03-061-2/+2
| | | | | | | | | | | | | | | | | | We need to include qimageiohandler.h if we want to be sure that we can use it. Also, QT_NO_IMAGEFORMATPLUGIN is defined in a header and needs to be checked after the includes. Change-Id: Ic6c376c87abb9684f45ca3d740deb7e580220ae4 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-26115-2291/+5668
| |\ | | | | | | | | | Change-Id: I8a8151eb2dd01059cf86da8f72ecb65612bff0c1
| | * Bundled libtiff updated to version 4.0.7v5.8.0-rc1v5.8.0Liang Qi2016-12-1343-567/+1503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libtiff 4.0.7, including COPYRIGHT, ChangeLog, README, README.vms, RELEASE-DATE, TODO, VERSION and libtiff, port directories. In libtiff, only includes SConstruct, libtiff.def, libtiff.map, libtiffxx.map, tif_config.h-vms, header and source files. In port, only includes header and source files. Upstream changes since 4.0.6 have been merged in, includes 701ba023 and 52dd6b1e. Also updated version in qt_attribution.json. Conflicts: src/3rdparty/libtiff/libtiff/tif_win32.c src/3rdparty/libtiff/libtiff/tiffiop.h src/3rdparty/libtiff/port/strtoull.c src/3rdparty/libtiff/qt_attribution.json Change-Id: I7a7a55676c007fd2b3eeff2b2e3ca481eb5724d9 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Bundled libwebp updated to version 0.5.1Liang Qi2016-12-1372-1724/+4165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libwebp 0.5.1, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. Upstream changes since 0.5.0 have been merged in. Also updated version in qt_attribution.json. Conflicts: src/3rdparty/libwebp.pri src/3rdparty/libwebp/qt_attribution.json src/3rdparty/libwebp/src/webp/config.h Change-Id: I7d0c15400154c3b4ee8ff37665303307c4b84f9f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Add support for multipage TIFF images to QTiffHandlerv5.9.0-alpha1Sandro Mani2017-01-252-10/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows multipage TIFF images to be read via QImageReader::jumpToImage and QImageReader::jumpNextToImage. [ChangeLog][QtGui][QImageReader] Support multipage TIFF images through QImageReader Change-Id: Id6ac68b75500148e51be11eff3d296c929d2d95c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-252-7/+3
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I519c785ed64bdb0669d884a11d45be6532e629ec
| * | QWbmpHandler: fix integer overflowMarc Mutz2017-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both 'hdr.height' and 'hdr.width' are quint32s. Multiplying them still gives a quint32, but the lhs expected a qint64. Fix by casting one of the operands to qint64. Coverity-Id: 22179 Change-Id: If7385fb42bf994d87ac4e603fa85be4a30ad6d5c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | QTgaFile: fix Coverity warning re:mixing enum typesMarc Mutz2017-01-051-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coverity complained that the 'bytes' variable was first compared to a QTgaFile::HeaderOffset, then, later, to a QTgaFile::FooterOffset. This is of course a false positive, but one that's trivial to fix, by not using a variable in the first place. Adjust to Qt coding standard as a drive-by. Coverity-Id: 22048 Change-Id: If1a45aa5b0c8ea23cab2cefeccb2f1dfe5f03375 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Build fix for libtiff on INTEGRITYKimmo Ollila2017-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | INTEGRITY doesn't have search.h header Change-Id: I5efe7d8ced37942de85ae810e22e528996e9904f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Nikola Velinov <nvelinov@ghs.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 21:12:21 +0000