summaryrefslogtreecommitdiff
path: root/ext/gd
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-1721-1/+69
|\
| * Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-1721-1/+69
| |\
| | * Skip tests that are supposed to fail due to bugs in old external libgdChristoph M. Becker2016-08-1721-1/+69
* | | Make this test also a little more resilientChristoph M. Becker2016-08-171-2/+2
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-1730-60/+60
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-1730-60/+60
| |\ \ | | |/
| | * Make tests a little more resilientChristoph M. Becker2016-08-1730-60/+60
| | * fix testsStanislav Malyshev2016-08-162-3/+3
| | * Fix bug #72730 - imagegammacorrect allows arbitrary write accessStanislav Malyshev2016-08-162-0/+20
| | * Fix bug#72697 - select_colors write out-of-boundsStanislav Malyshev2016-08-162-8/+25
| | * fix ts buildAnatol Belski2016-08-031-1/+1
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-08-175-6/+43
|\ \ \ | |/ /
| * | fix testsAnatol Belski2016-08-162-3/+3
| * | Fix bug#72697 - select_colors write out-of-boundsAnatol Belski2016-08-162-3/+20
| * | Fix bug #72730 - imagegammacorrect allows arbitrary write accessStanislav Malyshev2016-08-162-0/+20
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-022-1/+26
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-022-1/+26
| |\ \ | | |/
| | * Fix #72709: imagesetstyle() causes OOB read for empty $stylesChristoph M. Becker2016-08-022-1/+26
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-251-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-251-1/+1
| |\ \ | | |/
| | * Fix broken test caseChristoph M. Becker2016-07-251-1/+1
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-251-10/+12
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-251-10/+12
| |\ \ | | |/
| | * Fix broken test caseChristoph M. Becker2016-07-251-11/+13
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-231-28/+8
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-231-28/+8
| |\ \ | | |/
| | * Fix #68712: suspicious if-else statementsChristoph M. Becker2016-07-231-28/+8
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-231-4/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-231-4/+4
| |\ \ | | |/
| | * Fix copy&paste errors in gd_interpolation.cChristoph M. Becker2016-07-231-4/+4
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-231-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-231-1/+1
| |\ \ | | |/
| | * Fix #66555: Always false condition in ext/gd/libgd/gdkanji.cChristoph M. Becker2016-07-231-1/+1
* | | Add test case for imagecopyresampled() with alphaChristoph M. Becker2016-07-201-0/+70
* | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-07-191-2/+47
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-07-191-2/+47
| |\ \ | | |/
| | * Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Pierre Joye2016-07-203-16/+50
| | |\
| | * | #72482, revert for 5.6 for nowPierre Joye2016-07-201-2/+47
* | | | Merge branch 'PHP-7.0'Christoph M. Becker2016-07-193-16/+50
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-193-16/+50
| |\ \ \ | | | |/ | | |/|
| | * | Fix #43828: broken transparency of imagearc for truecolor in blendingmodeChristoph M. Becker2016-07-193-16/+50
| | |/
* | | Merge branch 'PHP-7.0'Pierre Joye2016-07-193-49/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Pierre Joye2016-07-191-47/+2
| |\ \ | | |/
| | * #72482, Ilegal write/read access caused by gdImageAALine overflowPierre Joye2016-07-191-47/+2
| * | merge conflictPierre Joye2016-07-191-2/+2
| |\ \ | | |/
| | * fix #72494, improve input color check and prevent issues when old gd are used...Pierre Joye2016-07-191-1/+1
| * | Merge branch 'PHP-5.6' into PHP-7.0Pierre Joye2016-07-191-0/+1
| |\ \ | | |/
| | * improve fix #72558, free contribRow as wellPierre Joye2016-07-191-0/+1
| * | Merge branch 'PHP-5.6' into PHP-7.0Pierre Joye2016-07-191-3/+4
| |\ \ | | |/
* | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-07-191-3/+4
|\ \ \