Commit: a1d0a869be09a63d74eb056e0cead8126270106a Author: Pierre Joye <pierre....@gmail.com> Thu, 20 Jun 2013 22:32:52 +0200 Parents: d5b1111fb0a34ecaadb3cfc7149407d3297aa16a c65d663aefd27e39006b9c20a665893aa5265ed4 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a1d0a869be09a63d74eb056e0cead8126270106a Log: Merge branch 'PHP-5.5' * PHP-5.5: fix #65070, bgcolor does not use the same format as the input image with imagerotate fix #65070, bgcolor does not use the same format as the input image with imagerotate Fix the spelling of the php_cli_server_http_response_status_code_pair typedef. Change the search in get_status_string() to correctly handle unknown codes. Update git rules (5.5 is stable, 5.3 sec only) skip test for bug #64936 when tokenizer not built Bump version Update credits Merge NEWS from PHP 5.4 branch Reorder NEWS for PHP 5.5.0 final Conflicts: configure.in ext/gd/libgd/gd_interpolation.c main/php_version.h Bugs: https://bugs.php.net/65070 https://bugs.php.net/64936 Changed paths: MM ext/gd/libgd/gd_interpolation.c Diff: diff --cc ext/gd/libgd/gd_interpolation.c index 2641f97,e3247a7..b6e7c69 --- a/ext/gd/libgd/gd_interpolation.c +++ b/ext/gd/libgd/gd_interpolation.c @@@ -1735,17 -1729,7 +1728,11 @@@ gdImagePtr gdImageRotateGeneric(gdImage f_slop_x > f_slop_y ? gd_divfx(f_slop_y, f_slop_x) : gd_divfx(f_slop_x, f_slop_y) : 0; + + if (bgColor < 0) { + return NULL; + } + - /* impact perf a bit, but not that much. Implementation for palette - images can be done at a later point. - */ - if (src->trueColor == 0) { - gdImagePaletteToTrueColor(src); - } - dst = gdImageCreateTrueColor(new_width, new_height); if (!dst) { return NULL; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
