Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Pierre Joye | 2014-03-09 | 1 | -0/+1 |
|\ | |||||
| * | - fix #66869, Invalid 2nd argument crashes imageaffinematrixget | Pierre Joye | 2014-03-09 | 1 | -0/+1 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-03-05 | 2 | -9/+16 |
|\ \ | |/ | |||||
| * | Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327 | Remi Collet | 2014-03-05 | 2 | -9/+16 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-02-20 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fixes #66714: imageconvolution breakage in 5.5.9 | Brad Daily | 2014-02-19 | 1 | -1/+1 |
| * | Bump year | Xinchen Hui | 2014-01-03 | 4 | -4/+4 |
* | | imagettftext() uses the last charactermap it found and not the one you want | Scott MacVicar | 2014-02-16 | 5 | -14/+319 |
* | | Bump year | Xinchen Hui | 2014-01-03 | 4 | -4/+4 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2013-12-28 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | minor fix on previous | Remi Collet | 2013-12-28 | 1 | -1/+2 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2013-12-28 | 2 | -22/+52 |
|\ \ | |/ | |||||
| * | Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) | Remi Collet | 2013-12-28 | 2 | -22/+52 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2013-12-27 | 2 | -34/+169 |
|\ \ | |/ | |||||
| * | Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) | Xinchen Hui | 2013-12-27 | 2 | -34/+169 |
* | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2013-12-07 | 1 | -16/+11 |
|\ \ | |/ | |||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2013-12-07 | 1 | -16/+11 |
| |\ | |||||
| | * | Switch to using freetype-config for freetype detection. | Adam Harvey | 2013-12-07 | 1 | -16/+11 |
* | | | Merge branch 'PHP-5.5' | Felipe Pena | 2013-10-20 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Felipe Pena | 2013-10-20 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | - Fix extern declaration according to definition | Felipe Pena | 2013-10-20 | 1 | -1/+1 |
| | * | typo fixes | Veres Lajos | 2013-07-15 | 2 | -2/+2 |
| | * | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -3/+3 |
* | | | Merge branch 'PHP-5.5' | unknown | 2013-09-09 | 1 | -1/+4 |
|\ \ \ | |/ / | |||||
| * | | ensure that the defined interpolation method is used by the generic scaling f... | unknown | 2013-09-09 | 1 | -1/+4 |
* | | | Merge branch 'PHP-5.5' | Christopher Jones | 2013-08-14 | 2 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Reduce compiler noise by removing unused variables and labels | Christopher Jones | 2013-08-14 | 2 | -2/+1 |
* | | | Merge branch 'PHP-5.5' | Christopher Jones | 2013-08-06 | 1 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | Fix long-standing visual pain point: the misalignment of './configure help' t... | Christopher Jones | 2013-08-06 | 1 | -4/+4 |
| * | | typo fixes | Veres Lajos | 2013-07-15 | 3 | -3/+3 |
* | | | typo fixes | Veres Lajos | 2013-07-15 | 3 | -3/+3 |
* | | | Merge branch 'PHP-5.5' | Christopher Jones | 2013-07-09 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Cleanup temp file | Christopher Jones | 2013-07-09 | 1 | -0/+2 |
* | | | Merge branch 'PHP-5.5' | Remi Collet | 2013-06-24 | 1 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | fix imagecreatefromwebp and imagewebp protos | Remi Collet | 2013-06-24 | 1 | -3/+3 |
* | | | Merge branch 'PHP-5.5' | Remi Collet | 2013-06-24 | 1 | -18/+1 |
|\ \ \ | |/ / | |||||
| * | | Use same logic to load WebP image that other formats | Remi Collet | 2013-06-24 | 1 | -18/+1 |
* | | | Merge branch 'PHP-5.5' | Remi Collet | 2013-06-24 | 1 | -11/+22 |
|\ \ \ | |/ / | |||||
| * | | Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75 | Remi Collet | 2013-06-24 | 1 | -11/+22 |
* | | | Merge branch 'PHP-5.5' | Stanislav Malyshev | 2013-06-23 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Require second parameter of imagecrop() | Jakub Vrana | 2013-06-23 | 1 | -1/+1 |
* | | | Merge branch 'PHP-5.5' | Remi Collet | 2013-06-21 | 1 | -3/+2 |
|\ \ \ | |/ / | |||||
| * | | Fixed Bug #65060 imagecreatefrom... crashes with user streams | Remi Collet | 2013-06-21 | 1 | -3/+2 |
* | | | Merge branch 'PHP-5.5' | Pierre Joye | 2013-06-20 | 2 | -30/+19 |
|\ \ \ | |/ / | |||||
| * | | fix #65070, bgcolor does not use the same format as the input image with imag... | Pierre Joye | 2013-06-20 | 2 | -29/+18 |
* | | | Merge branch 'PHP-5.5' | Stanislav Malyshev | 2013-06-10 | 1 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'pull-request/341' | Stanislav Malyshev | 2013-06-10 | 1 | -3/+3 |
| * | | Fix image method signatures | Jakub Vrana | 2013-06-10 | 1 | -7/+7 |
* | | | Fix image method signatures | Jakub Vrana | 2013-06-10 | 1 | -7/+7 |
* | | | Merge branch 'PHP-5.5' | Remi Collet | 2013-06-03 | 1 | -8/+8 |
|\ \ \ | |/ / |