11643aae7e
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Ic9e16588aea733598e4652741276c652bd0dbe68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-26 10:16:37 +00:00
19038af864
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I9ab92dc30643157ab818d72efdc37d823d50898e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-21 18:54:36 +00:00
cdaf1bc326
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Id9abe44feaa1f3ec4c3eb9652090e4bb9acda774
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-16 13:33:39 +00:00
93e55e37eb
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I53432f1aab2f0c868b925360d86267f1d795e0d5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-16 06:48:47 +00:00
cf55129688
CMake: Annotate some targets with SBOM information
...
Pick-to: 6.8
Task-number: QTBUG-122899
Change-Id: Ia0537ba36498ce0224b329f35f235416cc417d17
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2024-07-11 12:03:24 +02:00
3f62c46f54
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I97654bf1a52036820cc05546523122cfa5f7ae78
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-10 12:51:30 +00:00
f05a669021
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Ia774245a7d42027b11599447818010dd7ec84ed3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-10 06:59:16 +00:00
21a88b70b3
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I46af949355fd5d082c890ae6e541b936ce92b271
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-07-07 19:15:02 +00:00
96183be5de
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I9caf1f97fbb662f9f4ee5cf34cf4e69d8de1ed41
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-28 17:54:41 +00:00
0c706bcae7
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I26fdf34cb198f823ba833616ac8196decf914935
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-24 12:37:48 +00:00
9aa5594d61
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Icb18e08db1b17a44b0959301a9c12be84b9f9ff5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-20 05:15:55 +00:00
cfff8c5a63
CMake: Mark system-* features as SYSTEM_LIBRARY
...
This allows us to toggle these features in bulk.
Task-number: QTBUG-96910
Change-Id: I35d57bc5d1ff8baa0374d6fc673ee1e4154b82b2
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2024-06-19 14:48:59 +02:00
e9a98a5f11
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I74a33eeab1d0b07971346f848a6a3e2edf39688c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-18 11:19:00 +00:00
301e7a0d9d
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I70b19bc6bc7e720d4d7fdc2cdeccc0714c3f9a21
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-12 05:09:12 +00:00
73c92eb99f
Use Q_STATIC_LOGGING_CATEGORY
...
We shouldn't rely on the internals of Q_LOGGING_CATEGORY to place the "static".
Change-Id: I029e14df0c513158f73519991c1ce71ce9a7e802
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2024-06-11 04:28:40 +00:00
80904d1c25
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I47a1de15460c70d396c2cad2daec071917387aee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-11 04:28:39 +00:00
0b92ab30a3
Bump version to 6.9.0
...
Change-Id: If6e6ac99545242b48e248f40ebf50b9b53a3d8f2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-05 07:23:08 +01:00
61432f0590
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Ib42f352b72084a5de5048204295f7e625b8676f5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-05 06:23:06 +00:00
7ab8952608
Fix macjp2 canRead() function
...
The canRead() function is supposed to check for the presence of a 12
byte magic number (header). It used qstrncmp() for this, but as the
byte sequence starts with 0 values, the comparison would end after the
first byte, and any data also starting with a 0 value would be taken
as matching.
This would make QImageReader mis-identify the image format of image
data where an explicit suffix or data format was lacking, resulting in
image reading failures. The macheif autotest would hit this issue and
fail erroneously.
Pick-to: 6.8 6.7 6.5
Change-Id: I39b1ba9a344478fe1255c89f19488f0bc54d2ec1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2024-06-03 15:47:15 +02:00
138fe46bca
Blacklist tst_qheif::writeImage() on macOS 12 ARM
...
The codec doesn't seem to be supported on macOS 12 ARM VMs, giving:
IOServiceMatchingfailed for: AppleM2ScalerCSCDriver
887464167 0 AVE ERR: AppleAVEVA_DriverCreate:1105 serviceObject != 0 |
AppleAVEVA ERROR: IOServiceGetMatchingService failed
887464428 0 AVE ERR: AVE_CreateInstance:3985 false | FIG:
kVTCouldNotFindVideoEncoderErr.
887464466 0 AVE ERR: AppleAVEVA_DriverDelete:1448 pDriverInstance |
AppleAVEVA ERROR: AppleAVEVA_DriverDelete, pDriverInstance NULL.
887464496 0 AVE ERR: AVE_HEVCFinalize:4092 err == noErr | FIG:
AppleAVEVA_DriverDelete failed.
887465447 0 AVE ERR: AppleAVEVA_DriverCreate:1105 serviceObject != 0 |
AppleAVEVA ERROR: IOServiceGetMatchingService failed
887465478 0 AVE ERR: AVE_CreateInstance:3985 false | FIG:
kVTCouldNotFindVideoEncoderErr.
887465500 0 AVE ERR: AppleAVEVA_DriverDelete:1448 pDriverInstance |
AppleAVEVA ERROR: AppleAVEVA_DriverDelete, pDriverInstance NULL.
887465530 0 AVE ERR: AVE_HEVCFinalize:4092 err == noErr | FIG:
AppleAVEVA_DriverDelete failed.
But works fine in macOS 13 and 14 ARM VMs. So we blacklist the test.
Pick-to: 6.8
Change-Id: I52b0101375cad12d3129f8724d7bc7c9ce3afcae
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2024-06-03 12:05:15 +02:00
2b28cff1fb
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Id69420dfce788f79ac71d0754370996cfb8e28b4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-02 15:49:50 +00:00
5ae2a23499
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: If2280db161e09b2a647dd91377ec8cace8751d87
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-02 12:09:00 +00:00
65420b5467
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I37c90cf74978d01f12fe2fa327c49f0dda0ce855
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-06-01 13:07:40 +00:00
14970083d0
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I8dbe44f6851456985f07ce8bb4fde11128df2846
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-31 09:13:25 +00:00
401f88d6dc
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Ia0a0f8959e82c57b048aab113154d09717c2966a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-30 03:23:16 +00:00
48b56e796d
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Ibb786d6a381f982d1f9b47aec6a5066a64b9204d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-28 02:30:45 +00:00
a6cf8c5b13
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Ibba96fd3692ef5d363a73106820bd6f78c5743ba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-24 11:20:22 +00:00
5fef7dee16
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Ic51a1a7796b19b5e77815e39791618901ced9160
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-23 11:49:19 +00:00
3472cc5991
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I662a057dfd1709e9f55c311fb61bbdcf7fc35819
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-23 06:19:03 +00:00
56b4624960
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Id717ad466c59df9b93334c8b7a25b3cf5ab120d7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-20 04:42:29 +00:00
7dea1a5238
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: If6b5bcac053ad44cb0b5f3ce2ecbd6826dd22cac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-16 08:45:12 +00:00
8212cbad56
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Iaa0fa26466aa14f0be79a9a07899e49eedf2ebd7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-14 06:24:55 +00:00
0f495cc4db
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Ic64aeb3d98dba170dafdd324df4d73cd701e77be
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-09 16:19:10 +00:00
6aced7907e
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I993a9b71d34f01a4c3b8dbbd4b4778b4cabf43ac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-07 02:18:29 +00:00
da6405c3ad
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I86ec837c489675a6a914a1ad0643533fcada6416
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-03 05:18:54 +00:00
35d57cad04
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Ib965402783cb9228477598d7bf2678f11d720c80
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-02 04:41:12 +00:00
ed95681e62
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I511c88bcd7442ab18cb8295b06698dd21de0ba34
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-29 03:23:22 +00:00
490c1efee3
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I0537134fac0d4e210800e38113919abcc28e2848
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-24 02:29:04 +00:00
d2df8c0e1d
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: Ic9cbc675e18e5e51398365b69fb7289ba30d4306
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-19 02:38:08 +00:00
3daa1bd235
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I509e7cc098d0ca474ec125f4c67d0ced89ca647a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-17 03:22:16 +00:00
34282d8cef
Fix potential symbol clash in the IIOF helpers
...
Since the IIOF helpers are compiled multiple times into different
handler binaries, there is a potential for symbol clash when they are
linked into the same app. Solve by enclosing the IIOF helper class in
a namespace specific to each handler.
Fixes: QTBUG-113349
Pick-to: 6.7 6.5
Change-Id: I9784d5f76d990222dba0ba12e3ca30bfaa9945cc
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2024-04-16 10:39:42 +00:00
a5e0b01214
Update bundled libwebp to version 1.4.0
...
[ChangeLog][Third-Party Code] Update bundled libwebp to version 1.4.0
Pick-to: 6.7 6.5 6.2 5.15
Change-Id: I34bc162e3b64be75da0f82a0a7329eb1a0356239
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2024-04-16 08:03:23 +02:00
ff565219a7
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: If264e8d65e7fefba7b9697840f5539b3a8b8666e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-15 08:50:51 +00:00
c2731e594f
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I544d28f12fe75bad0b368ba25390a21b5124477f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-10 10:08:45 +00:00
adbede1e67
Tiff: Add message handler to pass errors/warnings through Qt logging
...
Use TIFFClientOpenExt() and set an error/warning handler to be able
to pass the output through the Qt logging system. Use
qt.imageformats.tiff as the logging channel.
This requires libtiff >= 4.5.0
Pick-to: 6.7
Fixes: QTBUG-122829
Change-Id: I19d453ced9af0b6bc20988f6f1505988c1c1aa5c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
2024-04-09 14:58:00 +00:00
22a97e80ac
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I8b0c30de51e07bb413bb6299aaae67175d4e7a5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-09 07:30:56 +00:00
d6b0fbc329
Update dependencies on 'dev' in qt/qtimageformats
...
Change-Id: I78e2e37201e1a1498212c0d51da6d158287090dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-08 06:57:37 +00:00
e4c8cd1f09
TIFF: add an autotest for CMYK images
...
This work has been kindly sponsored by the QGIS project
(https://qgis.org/ ).
Change-Id: I09cf744f1b8c907a296a8525ec11a4980282d743
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2024-04-08 08:36:57 +02:00
3cf129582b
TIFF: add support for CMYK image load/save
...
This work has been kindly sponsored by the QGIS project
(https://qgis.org/ ).
[ChangeLog][TIFF] Added support for loading and saving of 8-bit CMYK
TIFF files.
Change-Id: I380ef56023fea17f6155ee50fd09421891fbf192
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2024-04-08 08:36:43 +02:00
266f87720f
Preserve the ICC profile when saving TIFF files
...
QColorSpace only handles RGB matrix-based ICC profiles.
If one creates a QColorSpace out of an unsupported profile,
QColorSpace will still store it internally, to avoid a data loss
(e.g. loading and saving an image with an unsupported profile
is meant to preserve that profile, even if Qt was not able to use it.)
The TIFF plugin handler wasn't handling this case correctly, as
it checked whether the color space was valid (it wasn't), rather
than checking if it contained ICC data. Amend the check.
Change-Id: I68b89d6b9c27c2b1e5a6e348b91ebf510f8dc10d
Pick-to: 6.7 6.5 6.2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2024-04-04 15:30:50 +02:00
Qt Submodule Update Bot
Alexandru Croitor
Joerg Bornemann
Ulf Hermann
Jani Heikkinen
Eirik Aavitsland
Tor Arne Vestbø
Christian Ehrlicher
Giuseppe D'Angelo