summaryrefslogtreecommitdiff
path: root/src/3rdparty/libtiff
Commit message (Collapse)AuthorAgeFilesLines
* Update bundled libtiff to version 4.1.05.13Eirik Aavitsland2019-11-0631-712/+2630
| | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.1.0 Change-Id: I3e841863c5cf8588bf62b6520f34e64909394998 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Tiff: Include two upstream CVE fixes in bundled libtiffv5.13.25.13.2Eirik Aavitsland2019-10-238-112/+91
| | | | | | | | | | | | | | | | | | | | For issues CVE-2019-17546 and CVE-2019-14973, the following commits were merged into the bundled libtiff: 4bb584a35f87af42d6cf09d15e9ce8909a839145 RGBA interface: fix integer overflow potentially causing write heap buffer overflow, especially on 32 bit builds. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16443. Credit to OSS Fuzz 1b5e3b6a23827c33acf19ad50ce5ce78f12b3773 Fix integer overflow in _TIFFCheckMalloc() and other implementation-defined behaviour (CVE-2019-14973) Fixes: QTBUG-79397 Change-Id: I29257e6dbfbd816224d3dbaefdbe8afecd25f288 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@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>
* 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>
* Add fix for CVE-2017-18013 of libtiffv5.10.15.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)
* 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>
* 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>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-0643-567/+1503
|\ | | | | | | Change-Id: I9cf7f04769944935d7b836453c7982839857a909
| * Bundled libtiff updated to version 4.0.7v5.8.0-rc1v5.8.05.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>
* | 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>
* libtiff: Replace BSD advertising clauseKai Koehne2016-10-271-5/+6
| | | | | | | | 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>
* Add documentation for 3rdparty codeKai Koehne2016-09-191-0/+15
| | | | | | | | 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>
* Bundled libtiff updated to version 4.0.6v5.6.0-beta1Eirik Aavitsland2015-12-0938-1011/+2592
| | | | | | | | Upstream changes since 4.0.3 have been merged in. Our local tif_conf.h have been updated according to the upstream changes in tif_conf.h.in. Change-Id: I1c2aef6f0f60377de4876e25df723c32a6f95ea6 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Remove more extraneous files from bundled libtiffEirik Aavitsland2015-04-09142-29895/+0
| | | | | | | They are HOWTO-RELEASE, SConstruct, nmake.opt and html sub directory. Change-Id: If7d3aad3a353caa14239b1faf0af8b9cd393bcf7 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fixes windows ce buildv5.2.0-beta1Bjoern Breitmeyer2013-10-072-3/+5
| | | | | | | | | | | The windows file seems to handle ce too in the new version of libtiff. Only the <sys/types> include and the not defined error handle were a problem. The error handler ifndef _WIN32_WCE can be removed as Qt builds libtiff without the gui integration. Change-Id: Idb025f64fc31d580566d8ce248137e57d01e96b2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1Frederik Gladhorn2013-08-141-2/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | The inline keyword needs to be defined to __inline for MSVC when compiling C files. The patch removing the redefinition of inline does not work with the updated library, instead we resurrect the ifdef for MSVC only. Conflicts: src/3rdparty/libtiff/libtiff/tif_config.h Change-Id: I22bbaf3627fdb4f3dc60c9cd0f8d3282efc5bd2c
| * Make libtiff link on OS X 10.9old/5.1Gabriel de Dietrich2013-08-051-9/+0
| | | | | | | | | | | | | | | | | | Undefining the 'inline' keyword doesn't look very wise nowadays, and it did cause duplicate symbol erros at link time when linking against the 10.9 SDK. Change-Id: Ie6f8639fb920e57289c7d0ad8952603abcfe7377 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Upgrading libtiff: Patches to libtiff 4.0.3 for Qt usageLiang Qi2013-04-052-49/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the collection of those earlier patches to libtiff in Qt that are still relevant, updated as required. For details, refer to the git history of the src/3rdparty/libtiff directory of Qt 4 and Qt 5/qtimageformats. All defines which happened in tiffconf.h were commented in tif_config.h. Done-with: aavit <eirik.aavitsland@digia.com> Task-number: QTBUG-25409 Change-Id: I8dc43f0dfe47e6472c3475d9e60ee304dc54ee3b Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Upgrading libtiff: Adding clean copy of libtiff 4.0.3Liang Qi2013-04-05159-14670/+22457
|/ | | | | | | | | | | | | | This commit removes the previous version of the bundled libtiff (3.9.2), as well as all local modifications to it. It adds an unmodified copy of the official libtiff source distribution, except that various extraneous files have been removed, as usual. The patches required to build it in Qt will follow in separate commit(s). Task-number: QTBUG-25409 Change-Id: If47e02c25ce1a2b3b47eff94a875e2abea0c7e1c Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Fix compilation for Android.v5.1.0-alpha1BogDan Vatra2013-03-271-1/+1
| | | | | Change-Id: Ide46bb5104022c5e54a1f2a8bd7822a14bcf603d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add TIFF pluginKent Hansen2012-02-01212-0/+69678
Moved out from qtbase. Task-number: QTBUG-23887 Change-Id: I57d30173e6624d41dba1610084a7ed949ae84d1d Reviewed-by: aavit <qt_aavit@ovi.com> Sanity-Review: Kent Hansen <kent.hansen@nokia.com>
View Lorry Controller Status