[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/gd.c
Commit:4824d0f43e6d8742eafb5e751f3c9a3d7da3f3cd Author:Christopher Jones s...@php.net Wed, 14 Aug 2013 21:08:55 -0700 Parents: 3c166c47584c7a7eb8c1ce42ea05a8a5677da028 cd14de94d2428a28c8bfad1aad9837c59ab81e8f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4824d0f43e6d8742eafb5e751f3c9a3d7da3f3cd Log: Merge branch 'PHP-5.5' * PHP-5.5: Reduce compiler noise by removing unused variables and labels Changed paths: MM ext/gd/gd.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/gd.c
Commit:8c694401bb817ce645abe87c094615a3d5ed87ce Author:Remi Collet r...@php.net Mon, 24 Jun 2013 11:11:02 +0200 Parents: 6c56d785aea5a14cd8a6164f2a4e4e71bc55b9d6 8075f1f4a37804d00b35556826d378de513f7a8c Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8c694401bb817ce645abe87c094615a3d5ed87ce Log: Merge branch 'PHP-5.5' * PHP-5.5: Use same logic to load WebP image that other formats Changed paths: MM ext/gd/gd.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/gd.c
Commit:8e4e38aaeea0944a976fd2629c210c87483dcb3f Author:Remi Collet r...@php.net Mon, 24 Jun 2013 11:15:56 +0200 Parents: 8c694401bb817ce645abe87c094615a3d5ed87ce 9da4985bf2d532ed72fbd3a7d3390464692cce7a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8e4e38aaeea0944a976fd2629c210c87483dcb3f Log: Merge branch 'PHP-5.5' * PHP-5.5: fix imagecreatefromwebp and imagewebp protos Changed paths: MM ext/gd/gd.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/gd.c
Commit:46c46921b162f0f733c4e9745c5809645878f943 Author:Stanislav Malyshev s...@php.net Sun, 23 Jun 2013 20:30:03 -0700 Parents: e02b41d25c0b6cbbce56e097beae2dfe92626587 e1acaea4f1a2316ac89dce6c79fca483095bdca2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46c46921b162f0f733c4e9745c5809645878f943 Log: Merge branch 'PHP-5.5' * PHP-5.5: Require second parameter of imagecrop() Changed paths: MM ext/gd/gd.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/gd.c
Commit:20dbd2710835bf03a0f8e344e9bd1bbad38e845d Author:Remi Collet r...@php.net Fri, 21 Jun 2013 14:11:33 +0200 Parents: 9b22faa5b8ea2579f6247e024b0c59fd032a7eed fc898ee0f94ee3686aa1f359d4a973d5e8e1754b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=20dbd2710835bf03a0f8e344e9bd1bbad38e845d Log: Merge branch 'PHP-5.5' * PHP-5.5: Fixed Bug #65060 imagecreatefrom... crashes with user streams Fixed Bug #65084 imagecreatefromjpeg fails with URL Bugs: https://bugs.php.net/65060 https://bugs.php.net/65084 Changed paths: MM ext/gd/gd.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/gd.c
Commit:809b13d67bacc14ca3aaaf675d04a4000235af22 Author:Remi Collet r...@php.net Mon, 3 Jun 2013 14:17:22 +0200 Parents: 760099c2e6e7d72d4fb14c85ef2c1d73dcf9fb4c 245e103ed397da272dbd0bf02ce221ae6bcbbdef Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=809b13d67bacc14ca3aaaf675d04a4000235af22 Log: Merge branch 'PHP-5.5' * PHP-5.5: NEWS Fixed Bug #64961 segfault in imagesetinterpolation Bugs: https://bugs.php.net/64961 Changed paths: MM ext/gd/gd.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/gd.c
Commit:03091c834c7c26b715a8fe6c82db064f339927f3 Author:Remi Collet r...@php.net Mon, 6 May 2013 10:02:34 +0200 Parents: 76665ca070077df638cfdbbdca13f77000a23d92 9480de29db25982c75a7317ba779eec3d3847781 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=03091c834c7c26b715a8fe6c82db064f339927f3 Log: Merge branch 'PHP-5.5' * PHP-5.5: Revert removal of overflow2 use in gd.c Function provided by gd_security with bundled libgd Function provided by gd_compat with system libgd Changed paths: MM ext/gd/gd.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/gd.c
Commit:e7ffb773412db75ed6d09561cc78424ebe7b6f43 Author:Remi Collet r...@php.net Sun, 5 May 2013 08:35:34 +0200 Parents: a47c5ed855004d3e987b5e097015e530259f4fb2 9a48b6506cf1b4d98fa7d4e15f851430b6c07ada Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e7ffb773412db75ed6d09561cc78424ebe7b6f43 Log: Merge branch 'PHP-5.5' * PHP-5.5: gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd Changed paths: MM ext/gd/gd.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/gd.c
Commit:87de7b353bcb3acf6b9cd2a1b328e28cf27eb712 Author:Remi Collet r...@php.net Sun, 5 May 2013 09:56:52 +0200 Parents: e7ffb773412db75ed6d09561cc78424ebe7b6f43 0cae9a15d73a8b3d4a8dad92b295985df0dff98a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=87de7b353bcb3acf6b9cd2a1b328e28cf27eb712 Log: Merge branch 'PHP-5.5' * PHP-5.5: Move (back) missing functions in system libgd to gd_compat - display libPng version in all cases - gd_compat.c in ext/gd (nothing in ext/gd/libgd) Changed paths: MM ext/gd/gd.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/gd.c
Commit:71e76816cec42ac1d4b47a6008bd8ebb6279b369 Author:Remi Collet r...@php.net Sat, 4 May 2013 16:54:46 +0200 Parents: d6de58d7e4b40a77df06139b0c9c7b5eaa527f42 d981c191d452fe1f95ac31fcea366bc0c770b4b7 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=71e76816cec42ac1d4b47a6008bd8ebb6279b369 Log: Merge branch 'PHP-5.5' * PHP-5.5: NEWS fix build with bundled libgd Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/. Remove extra unused functions from gd_compat.h Rewrite Xpm library check so it doesn't break on MultiArch systems Required GD = 2.1.0 or GD bundled, this allows us to remove most of the #ifdef * Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm Remove overflow2, getmbi and skipheader, since they are not needed anymore. Allow to use new GD-2.1.0 function from system library Changed paths: MM ext/gd/gd.c Diff: diff --cc ext/gd/gd.c index 802b3d3,9b32630..c39ffdf --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@@ -97,43 -131,8 +135,12 @@@ static void php_free_ps_enc(zend_rsrc_l static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int, int); #endif - #if HAVE_LIBGD15 - /* it's = 1.5, i.e. has IOCtx */ - #define USE_GD_IOCTX 1 - #else - #undef USE_GD_IOCTX - #endif - - #ifdef USE_GD_IOCTX #include gd_ctx.c - #else - #define gdImageCreateFromGdCtx NULL - #define gdImageCreateFromGd2Ctx NULL - #define gdImageCreateFromGd2partCtx NULL - #define gdImageCreateFromGifCtx NULL - #define gdImageCreateFromJpegCtxNULL - #define gdImageCreateFromPngCtx NULL - #define gdImageCreateFromWBMPCtxNULL - typedef FILE gdIOCtx; - #define CTX_PUTC(c, fp) fputc(c, fp) - #endif - - #ifndef HAVE_GDIMAGECOLORRESOLVE - extern int gdImageColorResolve(gdImagePtr, int, int, int); - #endif - - #if HAVE_COLORCLOSESTHWB - int gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b); - #endif - - #ifndef HAVE_GD_DYNAMIC_CTX_EX - #define gdNewDynamicCtxEx(len, data, val) gdNewDynamicCtx(len, data) - #endif +/* as it is not really public, duplicate declaration here to avoid + pointless warnings */ +int overflow2(int a, int b); + /* Section Filters Declarations */ /* IMPORTANT NOTE FOR NEW FILTER * Do not forget to update: -- 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/gd.c
Commit:eaec5522ff2dec3e0ecfc73d0f64ea2cbb40b728 Author:Pierre Joye pierre@gmail.com Sat, 27 Apr 2013 17:52:38 +0200 Parents: bba7f8aa319a87c448fa6980031218917fa8c427 25c9f34c9c48cfca70d3e9a154255ef75efd3454 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eaec5522ff2dec3e0ecfc73d0f64ea2cbb40b728 Log: Merge branch 'PHP-5.5' * PHP-5.5: fix #64725, wrong res check Bugs: https://bugs.php.net/64725 Changed paths: MM ext/gd/gd.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/gd.c
Commit:bba7f8aa319a87c448fa6980031218917fa8c427 Author:Pierre Joye pierre@gmail.com Fri, 26 Apr 2013 08:16:02 +0200 Parents: fde3198daa7676477492614c6c8e19ef09f0c07b 2809afa1196bd73c3a5e5c119bd1d7db3cf45844 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bba7f8aa319a87c448fa6980031218917fa8c427 Log: Merge branch 'PHP-5.5' * PHP-5.5: - #64710, check return val - #64710, kill unused var #64710, kill unused vars #64710, kill unused vars #64710, kill unused vars #64710, kill unused vars #64710, kill unused vars #64710, Implicit declaration Bugs: https://bugs.php.net/64710 Changed paths: MM ext/gd/gd.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/gd.c
Commit:1d72ea493d2d86a3ee782246d76d8e7b59cf1d69 Author:Remi Collet r...@php.net Wed, 24 Apr 2013 14:32:09 +0200 Parents: 0f0cfaebd00a341116303dfde3e0a3e862ed3995 aa4b0af20f61f8d1642168258c37a78b5adf1329 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1d72ea493d2d86a3ee782246d76d8e7b59cf1d69 Log: Merge branch 'PHP-5.5' * PHP-5.5: gd: provide imageflip with system libgd when available Changed paths: MM ext/gd/gd.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/gd.c ext/gd/libgd/gd.h
Commit:5897696a0288b9e3abc292559d3ae07793f7c670 Author:Remi Collet r...@php.net Wed, 24 Apr 2013 16:11:34 +0200 Parents: 7264179eef2a17d04a0c86ec5b99f5b889acda12 dd0399f5c6d2acfe53621f9e5daf61c57e8e66c6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5897696a0288b9e3abc292559d3ae07793f7c670 Log: Merge branch 'PHP-5.5' * PHP-5.5: We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex gd: fix proto comment Changed paths: MM ext/gd/gd.c MM ext/gd/libgd/gd.h 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/gd.c
Commit:e12abebf506a9b96e5174ca06d57564d0d9f9f98 Author:Remi Collet r...@php.net Wed, 24 Apr 2013 16:16:25 +0200 Parents: 5897696a0288b9e3abc292559d3ae07793f7c670 26bd2cba815e01d9c20beba9b36d64fe27ce5740 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e12abebf506a9b96e5174ca06d57564d0d9f9f98 Log: Merge branch 'PHP-5.5' * PHP-5.5: gd: missing headers in previous allow use of gdImageCreateFromJpegEx with system libgd Changed paths: MM ext/gd/gd.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/gd.c
Commit:2fa178fa413b0460178b0eaac7f2b3ce21ad3b5b Author:Remi Collet r...@php.net Tue, 23 Apr 2013 13:46:24 +0200 Parents: 231e2d762a67f151ddd94d29d863b9213a535ac8 9819d81ddf53b3a601e228bbae29d8b22c6df147 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2fa178fa413b0460178b0eaac7f2b3ce21ad3b5b Log: Merge branch 'PHP-5.5' * PHP-5.5: enable WebP with system libgd when available (re)allow WBMP detection with system libgd provide getbmi and skipheader not exported functions in gd_compat. Changed paths: MM ext/gd/gd.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/gd.c
Commit:92a164069441a4259211bb702a38077e05344483 Author:Remi Collet r...@php.net Tue, 23 Apr 2013 13:53:07 +0200 Parents: 2fa178fa413b0460178b0eaac7f2b3ce21ad3b5b 2005a15caa36bc7974959885f837b9a3ebb78380 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=92a164069441a4259211bb702a38077e05344483 Log: Merge branch 'PHP-5.5' * PHP-5.5: fix copy/paste in error message Changed paths: MM ext/gd/gd.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/gd.c
Commit:41ef288ced776c1b1b8440cdbcaf3c82a27ff0c8 Author:Remi Collet r...@php.net Mon, 22 Apr 2013 17:48:43 +0200 Parents: 149cf2650a25fcff5d8de7a783c5d1fd7f1aeec7 ec1678dd7c1c802748f8a5d6811c571cc5752a6a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=41ef288ced776c1b1b8440cdbcaf3c82a27ff0c8 Log: Merge branch 'PHP-5.5' * PHP-5.5: temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported Changed paths: MM ext/gd/gd.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/gd.c
Commit:ca1962949eb18f60624e3cae5343a5b3dff98383 Author:Pierre Joye pierre@gmail.com Wed, 10 Apr 2013 20:14:00 +0200 Parents: 5868b93c49d1d70ba115691f77e0fcbb8075d4f7 87f5d9aa1bb9bdbfaecce5ad4739788a7719358f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ca1962949eb18f60624e3cae5343a5b3dff98383 Log: Merge branch 'PHP-5.5' * PHP-5.5: add external 2.1 detection and fix gd_compat for 2.1+ Changed paths: MM ext/gd/gd.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/gd.c
Commit:e2f3c7f2bc3853bb485b5a84abcef1958a96ccee Author:Pierre Joye pierre@gmail.com Thu, 11 Apr 2013 07:08:58 +0200 Parents: ab165d3465b689040f7306f41294db5d73a66076 e71b7945698c4df46c30d14108e61af2953ae233 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e2f3c7f2bc3853bb485b5a84abcef1958a96ccee Log: Merge branch 'PHP-5.5' * PHP-5.5: lucky that the name is not used, fix name of encoder Changed paths: MM ext/gd/gd.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/gd.c
Commit:95f830bc816f618d01641a5f2c9ea3c924b6d1bd Author:Pierre Joye pierre@gmail.com Thu, 28 Mar 2013 22:14:50 +0100 Parents: f2a2b418ec2be07a3046ab7ca541a90cc4572162 ac0b66f160cd59801cc2336c485f3db4225955ce Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=95f830bc816f618d01641a5f2c9ea3c924b6d1bd Log: Merge branch 'PHP-5.5' * PHP-5.5: fix BELL constant declaration Changed paths: MM ext/gd/gd.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/gd.c
Commit:33e834aab88277b1e4597c42878a2eebb428f3ef Author:Pierre Joye pierre@gmail.com Wed, 27 Mar 2013 17:39:05 +0100 Parents: b03810761eccd582f2c500c997424b646909d474 e7d88a63fa19c4b3df544563416b2c4370ad194b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=33e834aab88277b1e4597c42878a2eebb428f3ef Log: Merge branch 'PHP-5.5' * PHP-5.5: add WebP support in phpinfo Changed paths: MM ext/gd/gd.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/gd.c
Commit:705ab202522bda22e0bda2370ac9591fe3c83cb8 Author:Pierre Joye pierre@gmail.com Wed, 27 Mar 2013 05:13:42 +0100 Parents: 8a85da4a61c53f012174633ea7cef38cac6cfcbe f3ebb40ad6041e9c29e165f9d7017fb50063129f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=705ab202522bda22e0bda2370ac9591fe3c83cb8 Log: Merge branch 'PHP-5.5' * PHP-5.5: FALSE on error Changed paths: MM ext/gd/gd.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/gd.c
Commit:2a8a9c0007f4025d33693ec45a106adb81fc1376 Author:Pierre Joye pierre@gmail.com Fri, 22 Mar 2013 08:28:25 +0100 Parents: fa161e9a67b58a3a2f4dbebedce21c923ab80af1 4e6d54f5a7003b73f12d86d7f5cba0a37ce40930 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2a8a9c0007f4025d33693ec45a106adb81fc1376 Log: Merge branch 'PHP-5.5' * PHP-5.5: - fix regression (imagerotate_overflow.phpt) Changed paths: MM ext/gd/gd.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/gd.c
Commit:672f8525fbabf971afeebeed0c9d97aa760724c7 Author:Pierre Joye pierre@gmail.com Fri, 22 Mar 2013 09:21:23 +0100 Parents: 6512c44d8e645a8969b4c7cac55ca768b50cc5f6 f05972ddbf703da35ae9bde5c89d6f55f178b939 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=672f8525fbabf971afeebeed0c9d97aa760724c7 Log: Merge branch 'PHP-5.5' * PHP-5.5: - fix regression bug24155.phpt and bug39366.phpt Bugs: https://bugs.php.net/24155 https://bugs.php.net/39366 Changed paths: MM ext/gd/gd.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/gd.c
Commit:dd9e4b34d67eccc66eca17ef4c9e12d6b410303d Author:Pierre Joye pierre@gmail.com Fri, 22 Mar 2013 09:30:32 +0100 Parents: 672f8525fbabf971afeebeed0c9d97aa760724c7 f39a23696ba89d0dc77f7715f04ca7d1aa5b696e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dd9e4b34d67eccc66eca17ef4c9e12d6b410303d Log: Merge branch 'PHP-5.5' * PHP-5.5: - fix regression (imagerotate_overflow.phpt), fix for all cases Changed paths: MM ext/gd/gd.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/gd.c
Commit:09854f1fb9d4fbd11ef36a1d5cd11eec63569458
Author:Pierre Joye pierre@gmail.com Wed, 20 Mar 2013 12:34:51
+0100
Parents: 83e81c40ae61b66dc9ae1f804ee623fdeca66ac8
ff7d7bb290176f76a9108c839a38ecf39d4fef87
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=09854f1fb9d4fbd11ef36a1d5cd11eec63569458
Log:
Merge branch 'PHP-5.5'
* PHP-5.5:
- add gd changes
Conflicts:
UPGRADING
Changed paths:
MM ext/gd/gd.c
Diff:
diff --cc ext/gd/gd.c
index caf84e3,caf84e3..e571c04
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -5486,8 -5486,8 +5486,6 @@@ PHP_FUNCTION(imageaffine
pRect = NULL;
}
--
-- //int gdTransformAffineGetImage(gdImagePtr *dst, const gdImagePtr src,
gdRectPtr src_area, const double affine[6]);
if (gdTransformAffineGetImage(dst, src, pRect, affine) != GD_TRUE) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
