archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix #53640: XBM images require width to be multiple of 8

Browse source
This commit is contained in:
Christoph M. Becker 2016-06-17 17:50:36 +02:00
parent 0c34f53c93
commit ed0ec66996
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -11,6 +11,7 @@ PHP NEWS
- GD: - GD:
. Fixed bug #43475 (Thick styled lines have scrambled patterns). (cmb) . Fixed bug #43475 (Thick styled lines have scrambled patterns). (cmb)
. Fixed bug #53640 (XBM images require width to be multiple of 8). (cmb)
- OpenSSL: - OpenSSL:
. Fixed bug #71915 (openssl_random_pseudo_bytes is not fork-safe). . Fixed bug #71915 (openssl_random_pseudo_bytes is not fork-safe).

2
ext/gd/libgd/xbm.c
View file

@ -210,7 +210,7 @@ void gdImageXbmCtx(gdImagePtr image, char* file_name, int fg, gdIOCtx * out)
if (gdImageGetPixel(image, x, y) == fg) { if (gdImageGetPixel(image, x, y) == fg) {
c |= b; c |= b;
} }
if ((b == 128) || (x == sx && y == sy)) { if ((b == 128) || (x == sx - 1)) {
b = 1; b = 1;
if (p) { if (p) {
gdCtxPrintf(out, ", "); gdCtxPrintf(out, ", ");

2
ext/gd/tests/bug53640.phpt
View file

@ -12,8 +12,6 @@ $white = imagecolorallocate($im, 255, 255, 255);
imagefilledrectangle($im, 2, 2, 6, 6, $white); imagefilledrectangle($im, 2, 2, 6, 6, $white);
imagexbm($im, NULL); imagexbm($im, NULL);
?> ?>
--XFAIL--
Padding is not implemented yet
--EXPECT-- --EXPECT--
#define image_width 9 #define image_width 9
#define image_height 9 #define image_height 9