Merge branch 'PHP-5.6' into PHP-7.0

strk · Jun 17, 2016 · eb456d2 · eb456d2
2 parents 958f18c + ed0ec66
commit eb456d2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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