pajoye Sun Aug 26 20:35:11 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/gd/tests libgd00106.phpt
Modified files: /php-src/ext/gd/libgd gd.c /php-src NEWS Log: - MFB: gd #106, imagerectangle draws 1x1 rectangles as 1x3 rectangles http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.17&r2=1.90.2.1.2.18&diff_format=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.17 php-src/ext/gd/libgd/gd.c:1.90.2.1.2.18 --- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.17 Sun Jun 17 19:03:58 2007 +++ php-src/ext/gd/libgd/gd.c Sun Aug 26 20:35:10 2007 @@ -2124,6 +2124,12 @@ int half1 = 1; int t; + + if (x1 == x2 && y1 == y2 && thick == 1) { + gdImageSetPixel(im, x1, y1, color); + return; + } + if (y2 < y1) { t=y1; y1 = y2; http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.910&r2=1.2027.2.547.2.911&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.910 php-src/NEWS:1.2027.2.547.2.911 --- php-src/NEWS:1.2027.2.547.2.910 Thu Aug 23 22:39:01 2007 +++ php-src/NEWS Sun Aug 26 20:35:11 2007 @@ -1,5 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +- Fixed regression in imagerectangle for 1x1 rectangle (gd bug #106) (Pierre) 23 Aug 2007, PHP 5.2.4RC3 - Fixed version_compare() to support "rc" as well as "RC" for release candidate version numbers. http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00106.phpt?view=markup&rev=1.1 Index: php-src/ext/gd/tests/libgd00106.phpt +++ php-src/ext/gd/tests/libgd00106.phpt --TEST-- libgd #106 (imagerectangle 1x1 draws 1x3) --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); ?> --FILE-- <?php $im = imagecreatetruecolor(10,10); imagerectangle($im, 1,1, 1,1, 0xFFFFFF); $c1 = imagecolorat($im, 1,1); $c2 = imagecolorat($im, 1,2); $c3 = imagecolorat($im, 2,1); $c4 = imagecolorat($im, 2,2); if ($c1 == 0xFFFFFF && $c2 == 0 && $c3 == 0 && $c4 == 0) { echo "Ok"; } else { echo "failed"; } ?> --EXPECT-- Ok -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php