summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libpng/pngpriv.h
Commit message (Collapse)AuthorAgeFilesLines
* Update bundled libpng to version 1.6.32André Klitzing2017-08-261-20/+132
| | | | | | | | | | Also add import script. The remaining diff to clean 1.6.32 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.32 Change-Id: I1b4b78e39a6eb098d1b66c2528e47544bd9e6713 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update bundled libpng to version 1.6.28André Klitzing2017-01-311-98/+177
| | | | | | | | | | | | | Merged in the upstream version. The remaining diff to clean 1.6.28 is archived in the qtpatches.diff file. This fixes CVE-2016-10087 but Qt was never vulnerable to that issue! [ChangeLog][Third-Party Code] libpng was updated to version 1.6.28. Change-Id: I46712103fb160f31702eb7496fdd5c492a59ba5b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Update bundled libpng to version 1.6.20Eirik Aavitsland2016-03-161-0/+8
| | | | | | | | Merged in the upstream version. The remaining diff to clean 1.6.20 is archived in the qtpatches.diff file. Change-Id: I56f557bfe04ac1aa0e2c090826bbb144ae93cbb7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Update bundled libpng to version 1.6.19Joerg Bornemann2015-12-171-16/+29
| | | | | | | | | | Merged in the upstream version, which obsoleted some local patches. The remaining diff to clean 1.6.19 is archived in the qtpatches.diff file. Change-Id: I676df2dab2c52c7fe576de284d472d70206f0a8c Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Update bundled libpng to version 1.6.17Eirik Aavitsland2015-04-091-709/+940
| | | | | | | | | Merged in the upstream version, which obsoleted many of the local patches. The remaining diff to clean 1.6.17 is archived in the qtpatches.diff file. Change-Id: I5065435dc5a922d3f4a46eb37a23a4877dde2ee6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* libpng: Add Windows Phone to existing WinRT defineAndrew Knight2013-10-021-1/+1
| | | | | | | Treat Windows Phone as WinRT. Change-Id: I74e45a199629df3efaafa6acb05f991044f5c884 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* libpng: Add WinRT compatibilityKamil Trzciński2013-09-201-2/+5
| | | | | | | | | A _WINRT_ macro is added for Windows Runtime and a few codepaths are changed with it. Change-Id: I99ca5636d03c39b0a05b7f75f13522d012fdec07 Done-with: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Upgrading libpng: Patches to libpng 1.5.10 for Qt usageaavit2012-04-171-1/+12
| | | | | | | | | This is the collection of those earlier patches to libpng in Qt that are still relevant, updated as required. For details, refer to the git history of the src/3rdparty/libpng directory of Qt 4 and Qt 5/qtbase. Change-Id: Ia922441024536eec9b8ced8c3c5e4dc941ae152f Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Upgrading libpng: Adding clean copy of libpng 1.5.10aavit2012-04-171-158/+592
| | | | | | | | | | | | | This commit removes the previous version of the bundled libpng (1.5.4), as well as all local modifications to it. It adds an unmodified copy of the official libpng 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). Change-Id: I90149f87fc889c44a3b60b21cdf755020f3a8e39 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Remove Symbian specific code in 3rdparty.Xizhi Zhu2012-02-011-3/+1
| | | | | | | | | | | | | Symbian specific code in libtiff was added by commit 6ddf09085f1e8a3cc83c4ee0c77c433d26819c35 in Qt4, code in libpng was added by commit 66fb4038649cfd1d660204bf7c70f99a409ede4f in Qt4, so they are removed. Symbian specific code in freetype was copied from upstream, so kept untouched. Change-Id: I74f169d9283eefd91ec2e97cbd1b8f03dc449380 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+1245
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