Commit: 111123af4ff5bba76bc06066375a93c0babf84ac Author: Pierre Joye <pierre....@gmail.com> Tue, 26 Mar 2013 11:24:00 +0100 Parents: b6fa581d2de04b850129ad669b44865de4aef429 5ae6f582fb9af6e93ecd7001646553ae98be6275 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=111123af4ff5bba76bc06066375a93c0babf84ac Log: conflict Changed paths: MM ext/gd/gd.c MM ext/gd/libgd/gd.h MM ext/gd/libgd/gd_interpolation.c Diff: diff --cc ext/gd/gd.c index e1ac2b9,23a6ec9..c5a7fc8 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@@ -2271,11 -2263,7 +2271,7 @@@ PHP_FUNCTION(imagerotate ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd); - if (color < 0) { - RETURN_FALSE; - } - - im_dst = gdImageRotateInterpolated(im_src, (float)degrees, color); + im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color); if (im_dst != NULL) { ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php