[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/libgd/gd_interpolation.c
Commit:d32194172ad6dba22378609324b6d3ae2bcff41c Author:unknown paj...@php.net Mon, 9 Sep 2013 11:56:58 +0200 Parents: df711f2c56c74609ec5865fab5fee247b175c654 b54b6e30a4e46d9dd1f1bf0cbc0d4539c0f7d51d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d32194172ad6dba22378609324b6d3ae2bcff41c Log: Merge branch 'PHP-5.5' * PHP-5.5: ensure that the defined interpolation method is used by the generic scaling functions Changed paths: MM ext/gd/libgd/gd_interpolation.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/libgd/gd_interpolation.c
Commit:a1d0a869be09a63d74eb056e0cead8126270106a
Author:Pierre Joye pierre@gmail.com Thu, 20 Jun 2013 22:32:52
+0200
Parents: d5bfb0a34ecaadb3cfc7149407d3297aa16a
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
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/libgd/gd_interpolation.c
Commit:57dd91be827364eba4d185a20ff3b95d25031543 Author:Remi Collet r...@php.net Mon, 3 Jun 2013 15:02:43 +0200 Parents: 809b13d67bacc14ca3aaaf675d04a4000235af22 3579e81200927b75b2c5f353e016ec26d8884c26 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=57dd91be827364eba4d185a20ff3b95d25031543 Log: Merge branch 'PHP-5.5' * PHP-5.5: Fixed Bug #64962 imagerotate produce corrupted image Bugs: https://bugs.php.net/64962 Changed paths: MM ext/gd/libgd/gd_interpolation.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/libgd/gd_interpolation.c
Commit:8059ec1832d11e117a956b32a12c9a9464e466a5 Author:Pierre Joye pierre@gmail.com Mon, 27 May 2013 09:22:00 +0200 Parents: 6e081f8a821376281632bce87f99110eb4dc4ac4 2f01e06786c6f4b2479fdb728bd26062d07208e0 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8059ec1832d11e117a956b32a12c9a9464e466a5 Log: Merge branch 'PHP-5.5' * PHP-5.5: fix #64898imagerotate is broken with bilinear interpolation Bugs: https://bugs.php.net/64898 Changed paths: MM ext/gd/libgd/gd_interpolation.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/libgd/gd_interpolation.c
Commit:fc666bdb83ad2ba640b2dafad76930a87bff6b7c Author:Pierre Joye pierre@gmail.com Tue, 30 Apr 2013 08:03:46 +0200 Parents: 05a88447adcdae59c70723a9da209a711652432e 83682d8833f6885d17f8bfcab3c261113d85cbbb Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fc666bdb83ad2ba640b2dafad76930a87bff6b7c Log: Merge branch 'PHP-5.5' * PHP-5.5: fix #64738, fix implicit type declaration Bugs: https://bugs.php.net/64738 Changed paths: MM ext/gd/libgd/gd_interpolation.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/libgd/gd_interpolation.c
Commit:21cfbdf42c97f2f875f0bc7cc54ea9813b933d89 Author:Pierre Joye pierre@gmail.com Tue, 9 Apr 2013 06:45:24 +0200 Parents: 95f830bc816f618d01641a5f2c9ea3c924b6d1bd 85ad65ef4065735a8290602a3f10da21a07c5983 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=21cfbdf42c97f2f875f0bc7cc54ea9813b933d89 Log: Merge branch 'PHP-5.5' * PHP-5.5: fix some unitialized values and typo Changed paths: MM ext/gd/libgd/gd_interpolation.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/libgd/gd_interpolation.c
Commit:396b1109cff60de187f7d5dbb89d35a4189b088e Author:Pierre Joye pierre@gmail.com Tue, 9 Apr 2013 07:05:03 +0200 Parents: 28a9181ceb4058c6b6123fdf8a42adf8828b51ed 83500123d02789781c25691527ae720ba1587948 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=396b1109cff60de187f7d5dbb89d35a4189b088e Log: Merge branch 'PHP-5.5' * PHP-5.5: ws and comment for recommended aa method Changed paths: MM ext/gd/libgd/gd_interpolation.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/libgd/gd_interpolation.c
Commit:f21f37bb4c37d13bdfc81c96cbe12608d7e69e05 Author:Pierre Joye pierre@gmail.com Mon, 25 Mar 2013 03:14:40 +0100 Parents: 94c083ba645c77faa677c2ced7e2b5e8b94c3ebc 1b34ab8ff89d9710fa03245e868bd13254138ca6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f21f37bb4c37d13bdfc81c96cbe12608d7e69e05 Log: Merge branch 'PHP-5.5' * PHP-5.5: remove comments Changed paths: MM ext/gd/libgd/gd_interpolation.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
