diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-06-17 17:52:10 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-06-17 17:52:10 +0200 |
| commit | eb456d2d27a30d850a4bf0d929dc0af6d1a88184 (patch) | |
| tree | a59764bc5762fd05bad8603961218bba799433e3 | |
| parent | 958f18c1a12a3f1ac6fd6e119ad57ff9c6701b05 (diff) | |
| parent | ed0ec669968420ad0fa942c92d92b69a95e9beb1 (diff) | |
| download | php-git-eb456d2d27a30d850a4bf0d929dc0af6d1a88184.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | ext/gd/libgd/xbm.c | 2 | ||||
| -rw-r--r-- | ext/gd/tests/bug53640.phpt | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/ext/gd/libgd/xbm.c b/ext/gd/libgd/xbm.c index d127a1d4ff..b351814abb 100644 --- a/ext/gd/libgd/xbm.c +++ b/ext/gd/libgd/xbm.c @@ -210,7 +210,7 @@ void gdImageXbmCtx(gdImagePtr image, char* file_name, int fg, gdIOCtx * out) if (gdImageGetPixel(image, x, y) == fg) { c |= b; } - if ((b == 128) || (x == sx && y == sy)) { + if ((b == 128) || (x == sx - 1)) { b = 1; if (p) { gdCtxPrintf(out, ", "); diff --git a/ext/gd/tests/bug53640.phpt b/ext/gd/tests/bug53640.phpt index a16b7c24c0..ee875de19a 100644 --- a/ext/gd/tests/bug53640.phpt +++ b/ext/gd/tests/bug53640.phpt @@ -12,8 +12,6 @@ $white = imagecolorallocate($im, 255, 255, 255); imagefilledrectangle($im, 2, 2, 6, 6, $white); imagexbm($im, NULL); ?> ---XFAIL-- -Padding is not implemented yet --EXPECT-- #define image_width 9 #define image_height 9 |