| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I827727fde51a71cbef5d61fb6cc2cd45d5e3bd7c
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
[ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.9
Change-Id: I64a56d9b01cc1bb102a3368269ae9915fac5a051
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I84737121b8915a6c358ad92246984749e2719bed
|
| |
| |
| |
| |
| | |
Change-Id: Iba0631701fbecdd66ffa1d12c57387d76aa65475
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: I1e024810b9c5a9fc32986507d263f8b9727f2315
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I32dd4ece07c0ff4ef882fffe69afbe2f4a818a96
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Use new sizeInBytes() method.
Change-Id: I3fa5969ac04e2edb87a06f132dc0b60e65718b81
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I55c144a1d0579aa19691c44c4f8ef8bf702189cb
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-61640
Change-Id: I9d0bfbafe15df338355cf2f5c77c2d4f8f00d27f
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-61641
Change-Id: I24a139cc75141a588f2ed2558da85cd2f8391af9
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
...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>
|
|/
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I69942195d5208985d75333a13ed0ac5ae8f595d2
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: I9cf7f04769944935d7b836453c7982839857a909
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |\
| | |
| | |
| | | |
Change-Id: I8a8151eb2dd01059cf86da8f72ecb65612bff0c1
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I519c785ed64bdb0669d884a11d45be6532e629ec
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Enabled C99 for INTEGRITY to allow non-constant values for array size
Change-Id: I51978d26a9ec4798eb541dc0a03b633ac9eb426a
Reviewed-by: Nikola Velinov <nvelinov@ghs.com>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
QImageIOPlugin::keys() was removed in Qt 5.0 by
c9d040c1f5b0ee0ddd37e924576ec3bbd990f2ed in qtbase.
Change-Id: Ifda96e4764aa82d6f608d9ee2e29bac554603705
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I12f79f8fecdd03e4e6d4ce76e49d3c2d91003676
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|/
|
|
|
|
|
| |
The 'override' specifier can be used directly since Qt 5.7.
Change-Id: I673d4a3028132318dc5e686100476a8758984f0d
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|\
| |
| |
| | |
Change-Id: I6c1caae4b071cac4caf88bf85582a2a76a1ccd2b
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/plugins/imageformats/webp/qwebphandler.cpp
Change-Id: I494e140819746c83e586bea72d8b02a7d245d970
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The code tries to expand a 16-bit value of the form 0bABBBBBGGGGGRRRRR
into a 32-bit QRgb, but got the operator precedence wrong:
<< has higher precedence than binary &
This made the first operand of the |-chain (BBBBB) unconditionally
zero. The second operand had the same precedence problem, but didn't
decay into a tautological value like the first one did.
Fix by adding another set of parentheses.
The test coverage for this security-relevant piece of code is quite
obviously insufficient, and should be increased, or else the format be
dropped.
[ChangeLog][TGA] Fixed reading of TGA-16 formats.
Coverity-Id: 21782
Change-Id: I7019be8fe22e480c40192e0c1916b1d2bebf71cc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Coverity complained about uninitialised members of m_features in
QWebpHandler, and m_header and m_header10 in QDDSHandler, so force
value-initialization, in this case zero-initialization, by explicitly
adding the fields to the ctor-init-list.
Coverity-Id: 21998
Coverity-Id: 22032
Change-Id: Ie45023eda82b7034a0b3e33bab4fb23465cdc7cf
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As it stands right now, it's severely bugged and a security minefield (crashes).
It is also pretty useless in combination with QImage: DDS files are supposed to
carry multiple individual textures, texture arrays, cubemaps; mipmap chains;
and may use specific texture compression formats. All these features are not
supported at all by QImage.
[ChangeLog][QtImageFormats] The DDS image plugin has been disabled
due to lack of maintenance.
Change-Id: I6e53b1b14de316389813ddd3e34a644065937b4a
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Coverity was clever enough to see that the arguments to qRgba()
were swapped, but too dumb to understand the comment right above.
Fix the warning by explicitly swapping b and r, and then passing
the arguments in the correct order.
Coverity-Id: 22421
Change-Id: I87f98ea2bc8745c85fda5dbf0b03a505866ed4ae
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
| |\|
| | |
| | |
| | | |
Change-Id: I797cc909dd28e852460554059e27d38ed91d3252
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
While the repository still contains bundled copies of 3rd party codecs
for these formats, they are not part of the build process anymore;
the corresponding plugins are built only when the system libraries
are found.
Change-Id: Ib658b921bd08b63e68886922fc6bc45c5c3cc637
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QT_ARCH for tvOS is arm64 (not arm, since it’s 64bits only)
Change-Id: Ia03d3ee07d2543a0e70ee7d77448aff9382d8fc8
(cherry picked from commit e4c1d9ece74de212ebe5c55b134de7cb23469e2d)
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I3dabc9d3c5d84693724f3dacc68956f89c17ec9e
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Replace strtoull.c from libtiff with version in qtbase that has
an updated license without advertising clause.
Change-Id: I3ffdb8799adc6ef18c60021d2d2fe222df1c2acd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
it's not quite clear why it was included.
however, it pulled in CoreGraphics transitively, which now has to be
done explicitly.
Change-Id: I4186f0603360645d81895d850005af01966834c5
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use new licensescanner / qt_attribution.json file infrastructure to
generate documentation about 3rdparty licenses.
Change-Id: Ic81d8c33be094e51b6e4ca0f35074136170f491b
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a linking error on tvOS (though strangely not macOS).
Change-Id: I1f339fefa07ab55bc943aabf895f713e8ef6f6c1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ic2313cf8a6e938d5885aa1e26c36a5d7d5af166d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|