summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I6ed160d21aa58a73af959da17e9db7284eb67ad4
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+24
|\| | | | | | | Change-Id: I30c4972ee883b9b4aa8b4f615c56d174346e78ae
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+24
| |\ | | | | | | | | | Change-Id: Ie6a8107de26d129e4d93471d7ca6e6180ba4301a
| | * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-251-0/+24
| |/ | | | | | | | | | | | | | | + 50f6698117c2259bdd78868620908eec79e09561 Bump version + 0e8422bedc8c84ff7c08c6b3163329e82c2007dd Update bundled libwebp to version 1.0.2 Change-Id: I32217b3cc2336c930278af3be8d95dda85ed5f88 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-0/+25
|\| | | | | | | Change-Id: Ieeb5bc0259e8e18c46300ec2fbcf02d354565cee
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+25
| |\ | | | | | | | | | Change-Id: I29bc61b996eac4cb7e0e3cddee2384b4e7fe4238
| | * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-091-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 2f61f401187d55bb0304591f27792a63a38db00e Bump version + 0c8d172cf34f442a1318388f751d7e0f652d7072 Update bundled libwebp to version 1.0.1 + 43403038cf75086409bf7ee485ae855fd4c1c1e1 Update bundled libtiff to version 4.0.10 + 335dc6af7d24c1731cbd7e03a21e66c70d81760d Add changes file for Qt 5.11.3 + cbdabc6a23d9ac66c7361a4437f649aacab7d900 Bump version Change-Id: I825bca621f36828296be9fab4bab4123aec59747 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie953fa849567ba6f518f1f309d14643c994bbc43
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ | | | | | | Change-Id: Ibd92992bbf1cc5ab6ddfe10872838b47a970645e
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie540b789353b9c702808aafc1a2f476acd723fad
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I0b0ad828fc464b89844636ab34ce6a30f6457367
* | Add Grayscale16 support to TIFFAllan Sandfeld Jensen2019-01-034-3/+28
| | | | | | | | | | Change-Id: I927d9ab0af78baf90d8fd8d44088218dff0e7082 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-15136-864/+1719
|\| | | | | | | Change-Id: Ia3396dd92c66c42b8b0d0deba6b57b344a38ad02
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-11136-864/+1719
| |\ | | | | | | | | | Change-Id: Ib84ba922bb21f9e6c52c3096e7ae0fc10025c202
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-04136-864/+1719
| | |\ | | | | | | | | | | | | Change-Id: I5ef5083941390a0b9d9fe59b63a744e5a1aecf18
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-241-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 43403038cf75086409bf7ee485ae855fd4c1c1e1 Update bundled libtiff to version 4.0.10 + 0c8d172cf34f442a1318388f751d7e0f652d7072 Update bundled libwebp to version 1.0.1 + 7cfe47a8fe2f987fb2a066a696fb3d9d0afe4d65 TGA handler: check for out of range image size + 80017a1c7f829355edce61d5d50196cd1e13dcdd Bundled libtiff: add a number of security-related upstream patches + 8455ab6cb29fcccf44977c517689a8ad26781140 tiffhandler: improve stripsize + 2f61f401187d55bb0304591f27792a63a38db00e Bump version Change-Id: If31999c0f727ce8b73e5ffb35e247d1106011bb9 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | | * 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.12' into devQt Forward Merge Bot2018-12-081-0/+43
|\| | | | | | | | | | | Change-Id: If493c5cec19c69a42834fe4307562781fb23984e
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+43
| |\ \ | | | | | | | | | | | | Change-Id: If23873da11d13d8309efe25240269f9d11889ee3
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.0Antti Kokko2018-10-311-0/+43
| | | | | | | | | | | | | | | | | | | | Change-Id: I016e1d4158385e185248802699f9e04721e9e10a Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I2437905719aeca92ead392ade8b8b64706bcbfc0
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0817b4aa191d2523f65242043ca547a20d020f75
| | * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | Change-Id: I4c7777870ba33b26f3808eb3211b795138e6f74f
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-301-5/+14
|\| | | | | | | | | | | Change-Id: I5fb7fe6fc77310fd5e298e3bc34054944ee6d896
| * | 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-20125-42502/+38
|\| | | | | | | | | | | Change-Id: I946f97342788aedfd076c98abd44841720e507ed
| * | 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>
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-134-10/+31
| |\| | | | | | | | | | Change-Id: If9cf53dac5e906350e652e52842f3b54bc3fe65f
| | * Bundled libtiff: add a number of security-related upstream patchesEirik Aavitsland2018-10-124-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comprises the following libtiff commits, related to the listed CVEs: 3719385a3fac5cfb20b487619a5f08abbf967cf8 CVE-2017-11613 7a092f8af2568d61993a8cc2e7a35a998d7d37be CVE-2017-11613 de144fd228e4be8aa484c3caf3d814b6fa88c6d9 CVE-2018-10963 58a898cb4459055bb488ca815c23b880c242a27d CVE-2018-8905 981e43ecae83935625c86c9118c0778c942c7048 CVE-2018-10779 [ChangeLog][TIFF] A number of security-related upstream patches has been applied to the bundled libtiff Change-Id: I3def9a9b91d0dd2cfd959c5e83d972beed9394d6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-1381-99058/+8
|\| | | | | | | | | | | Change-Id: Ia9b757e38918f7d6612a04112e46c5c121af7157
| * | Remove bundled, unmaintained libmng source codev5.12.0-beta2Eirik Aavitsland2018-10-1281-99058/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | [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>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: Iab1e4d5056c3da8e122e9ecdc61e308759a63044
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-221-1/+1
|\| | | | | | | | | | | Change-Id: I6c9bf4e3cebdd3b8d41bf15ca7f776225993f871
| * | 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.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\| | | | | | | | | | | Change-Id: Ie564365f83e750ee6545b3330b96c36c9a6368be
| * | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
| |\| | | | | | | | | | Change-Id: Iecd1afcf29ff40333e809a953f8807180c81ef78
| | * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| | |\ | | | | | | | | | | | | Change-Id: Ia939d042682fefbf7774352ebce4b07efa5bb45e
| | | * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-311-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: Id37f327e4b404e20b50ceabcd754b2a61089c793 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | | * TGA handler: check for out of range image sizeEirik Aavitsland2018-08-291-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> (cherry picked from commit 7cfe47a8fe2f987fb2a066a696fb3d9d0afe4d65)
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-081-0/+8
|\| | | | | | | | | | | | | | | Change-Id: Ifc548b6195797206769e5554a06e2a254973d967
| * | | 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-08-255-12/+122
|\| | | | | | | | | | | Change-Id: I22e0486f077e9e71deaec5c2d9076f2868bbc55f
| * | Add RGBA64 format support to TIFF pluginAllan Sandfeld Jensen2018-08-235-12/+122
|/ / | | | | | | | | | | | | 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-07-310-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie5dd492beacabe7e31b28e225c72b939d6ac0e41
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 12:37:34 +0000