summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libjpeg
Commit message (Collapse)AuthorAgeFilesLines
* Fix license information for libjpeg-turboKai Köhne2021-06-044-15/+65
| | | | | | | | | | | | | | Fix the license metadata in that libjpeg contains parts under three different bsd-like licenses. Also, do include the IJG, zlib license texts in the metadata. [ChangeLog][Third-Party Code] Clarified that libjpeg-turbo is actually covered by three licenses, not only IJG. Change-Id: I6c4e3e8577bdf83e7e73474b34b0553cbe1d9b6d Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 467b39d52c9ab59b1e7518330fbb51d5543ada50) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Cherry-pick upstream patch for non-gcc/clang/msvc compilersAllan Sandfeld Jensen2021-05-183-4/+15
| | | | | | | | | | Fix build w/ non-GCC-compatible Un*x/Arm compilers Fixes: QTBUG-93779 Change-Id: Ib52e9ded6e2814c7998d6cd798e945da0f87f7a1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 4341f6763b8a737ebc07bb78ead22bc05a1a515b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libjpeg-turbo to version 2.1.0Eirik Aavitsland2021-05-0539-667/+1079
| | | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.1.0 Change-Id: I82a58609120923c18f6031fec7d597138ec473ee Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 127f617387c00139dddbfc9438ab032e24559566) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Simplify bundled libjpeg buildEirik Aavitsland2021-05-053-1/+1
| | | | | | | | | | | | | Move the config headers of the bundled libjpeg back into its source directory, where they originally live, to avoid having to trick with the include path to find them. The goal is unification across maintained Qt branches, making version updates simpler. Change-Id: I5b574446bbd264b0a1cb3efceb4c1cb7203cac7d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 5df88b85c6e61409c5c759e78f32edaac7b2022f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libjpeg-turbo to version 2.0.6Eirik Aavitsland2021-03-1926-150/+235
| | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.6 Change-Id: I3e308d241853edf3c1d616955cda203220a258d8 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit ede0082f861146d441df641d93f815dbe63a9076) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libjpeg-turbo to version 2.0.5Eirik Aavitsland2020-08-068-15/+47
| | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.5 Pick-to: 5.15 5.12 Change-Id: I9d4c403fbc998243c32d1bf1f1fbaf53270ffb9c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update bundled libjpeg-turbo to version 2.0.4Eirik Aavitsland2020-03-3010-50/+93
| | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.4 Change-Id: I7f74af0dc774a2172ff59713613a706e80d5b2cb Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update bundled libjpeg-turbo to version 2.0.3Eirik Aavitsland2019-10-2510-24/+82
| | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.3 Task-number: QTBUG-79420 Change-Id: I9f9b8b3a913fd5843759c0610f43b22c5bee67dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update bundled libjpeg-turbo to version 2.0.2Eirik Aavitsland2019-02-279-56/+105
| | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.2 Task-number: QTBUG-73883 Change-Id: Ib4ed145f1ed9c51933aae565dcb4064ffd60ec24 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* fix configure instructions in libpng and libjpeg attributionsOswald Buddenhagen2018-11-061-1/+1
| | | | | | Fixes: QTBUG-71379 Change-Id: Ib1efbe0fc4407ccf6ab814229dc4a08d9d03b6b5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update bundled libjpeg-turbo to version 2.0.0Eirik Aavitsland2018-09-2883-5259/+5790
| | | | | | | | | | | New, manually created configuration files (jconfig.h / jconfigint.h) for building in Qt are now placed outside the src directory. [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.0 Done-with: André Klitzing <aklitzing@gmail.com> Change-Id: I77e34419ebe2f70038b9b80cdf13876055c2a35f Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update bundled libjpeg-turbo to version 1.5.3André Klitzing2018-01-256-9/+76
| | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 1.5.3 Change-Id: I8c0caec3c92ba199b1a3baac9a523cc399c8001f Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Replace bundled libjpeg by libjpeg-turbo 1.5.2André Klitzing2017-09-28132-31640/+25460
| | | | | | | | | | | | | | | Most linux distribution uses libjpeg-turbo as a replacement for libjpeg. Since Qt will be linked against -turbo more frequently than the "original" libjpeg we should use it for the bundled copy, too. Also add an import script. [ChangeLog][Third-Party Code] Replaced bundled libjpeg by libjpeg-turbo 1.5.2 Change-Id: I41081db74f194cbc288820fc783c9fef16545efd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Add qt_attribution.json filesKai Koehne2016-08-122-0/+63
| | | | | | | | | | | | | | The format is documented in http://wiki.qt.io/Qt_attribution.json Also add a LICENSE file in case there is none yet (usually copied from the source headers). Task-number: QTBUG-55139 Change-Id: Ib54c73d0bb9946cfd8579e86c6858035184ca516 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Fixed libjpeg compiler warning about macro redefinition.Janne Anttila2012-04-181-1/+1
| | | | | | | | | | | When compiling Qt for Windows CE the MSVC reported the followin warning: warning C4005: '_CRT_SECURE_NO_DEPRECATE' : macro redefinition Fixed by adding ifdef quard for duplicate _CRT_SECURE_NO_DEPRECATE. Task-number: QTBUG-22512 Change-Id: I8c37ffe6ca275c80a7b7e6b23f39f3ab06b332f1 Reviewed-by: aavit <qt_aavit@ovi.com> (cherry picked from commit 1a1a8f004824b981865c6239747ff05d8e6f812a)
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2788-0/+45319
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 23:17:24 +0000