[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/gd/gd.c

[Pierre Joye]

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