f6da70863f
Merge branch 'PHP-7.0' into PHP-7.1
2016-10-01 00:00:46 +02:00
12967bc346
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-30 23:54:18 +02:00
9acfb1a3a5
Fix #73213 : Integer overflow in imageline() with antialiasing
...
We port the respective fixes <https://github.com/libgd/libgd/commit/eca37d620 >
and <https://github.com/libgd/libgd/commit/837b7327 > to our bundled libgd.
2016-09-30 23:38:13 +02:00
2b8024bb04
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Add an include path for freetype which is relevant for cmake builds
2016-09-25 20:57:30 +02:00
4e7b5ca459
Add an include path for freetype which is relevant for cmake builds
2016-09-25 20:55:13 +02:00
daba342f57
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-25 10:49:43 +02:00
fa9d41f66c
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-25 10:46:44 +02:00
c696bc8cfa
Fix test_image_equals_file() wrt. palette images
...
The recently introduced test_image_equals_file() doesn't properly work for
palette images, because in this case only the palette indexes are compared,
what can lead to false positives and negatives as shown in the added test.
To fix that we convert palette images to truecolor, what is supposed to be
faster than calling imagecolorsforindex() for each pixel.
We furthermore rely on PHP's refcounting to free unused images; after all,
this is not C.
2016-09-25 10:34:03 +02:00
c733f92d72
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-24 12:47:07 +02:00
5c81298597
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-24 12:41:48 +02:00
8f5eda4bf6
Fix #73161 : imagecreatefromgd2() may leak memory
2016-09-24 12:36:54 +02:00
394e9b3d15
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-24 11:37:23 +02:00
61722743f4
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-24 11:31:54 +02:00
709731797c
Fix #73159 : imagegd2(): unrecognized formats may result in corrupted files
...
We must not apply the format correction twice for truecolor images.
2016-09-24 11:28:20 +02:00
bc9efac0fe
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-24 10:58:39 +02:00
0a4b72fa94
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-24 10:48:24 +02:00
c7936ead8f
Fix #73155 : imagegd2() writes wrong chunk sizes on boundaries
2016-09-24 10:33:49 +02:00
1da79a6c6e
Fix #73157 (again): imagegd2() ignores 3rd param if 4 are given
...
Obviously, there was a bad merge.
2016-09-24 00:35:24 +02:00
bf66af1d60
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-24 00:07:50 +02:00
456be3ec37
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-23 23:46:22 +02:00
c240978067
Fix #73157 : imagegd2() ignores 3rd param if 4 are given
...
We must initialize `q` for *more* than three parameters, too.
2016-09-23 23:42:34 +02:00
bf35b31f56
Fix FreeType tests using UTF-8 font file names
...
UTF-8 font file names are not yet supported on Windows[1], so we're skipping
the respective tests on this platform, but enable them on other platforms.
[1] <http://news.php.net/php.internals.win/1142 >
2016-09-23 15:49:21 +02:00
8dfee1a777
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-23 12:57:10 +02:00
deda058751
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-23 12:29:37 +02:00
726c5999eb
Rework FreeType related tests
...
Firstly, there is no fundamental difference between running the tests on
freetype before and after 2.4.10, so we re-join the respective test cases.
Secondly, there are some minor differences in the results depending on
architecture, freetype versions and config options, so we cater to that
by allowing small deviations from the expectations.
2016-09-23 12:00:41 +02:00
7e21cb0c99
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-20 12:18:13 +02:00
eeb9113b6c
Skip failing FreeType tests for now
2016-09-20 12:16:16 +02:00
474428943f
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-20 01:32:32 +02:00
ba2d9e1ff1
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-20 01:25:08 +02:00
fc2cadca2d
Merge branch 'pull-request/1845' into PHP-5.6
2016-09-20 01:05:57 +02:00
a8a123e36c
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-16 11:48:53 +02:00
c18263e0e0
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-16 11:41:42 +02:00
46df064261
Fix #73003 : Integer Overflow in gdImageWebpCtx of gd_webp.c
...
We add the missing integer overflow check to avoid potential buffer overflows.
2016-09-16 11:37:18 +02:00
41001f8bb5
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-15 00:55:41 +02:00
cf9e2fbbf6
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-15 00:50:49 +02:00
7bfb7b62b1
Fix and reactivate regression test for bug #50194
...
Apparently, different FreeType versions render the string differently, so
we have to cater to these slight differences. Unfortunately, the testing
framework doesn't yet offer a clean API for this, so we work around the
limitations by parsing and checking the output of test_image_equals_file().
2016-09-15 00:46:00 +02:00
1c8c61f142
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-14 20:03:00 +02:00
7a923c3afe
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-14 20:02:05 +02:00
36df4f8419
Skip ext/gd/tests/bug50194.phpt for now
...
There are apparently issues with the font rendering with different freetype
version; I'll have a look at this issue ASAP.
2016-09-14 20:00:30 +02:00
b1a65452a1
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-14 16:01:02 +02:00
bc27ce98ee
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-14 15:50:09 +02:00
09eb6ed35e
Fix #50194 : imagettftext broken on transparent background w/o alphablending
...
We must not draw the background pixels of the character glyphs, what has
already been fixed in GD 2.0.26.
2016-09-14 15:47:32 +02:00
c7adfeb6c6
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-12 13:36:24 +02:00
82fa85fd08
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-12 13:27:57 +02:00
0cbf634657
Skip regression test for issue that has not yet been released in libgd
...
<https://github.com/libgd/libgd/issues/177 > has been assessed as enhancement,
so most likely it will be released with GD 2.3.
2016-09-12 13:21:34 +02:00
6ef0b09948
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-12 12:44:49 +02:00
c2044e60f3
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-12 12:39:14 +02:00
fcdc30b347
Skip test for external GD because of not yet published bugfix
2016-09-12 12:34:11 +02:00
6c3f90cab9
Merge branch 'PHP-7.0' into PHP-7.1
2016-09-12 00:03:56 +02:00
c02cfd4e25
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-11 23:51:32 +02:00
Christoph M. Becker