summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libtiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>