[PHP-CVS] com php-src: merging conflict left over: ext/gd/libgd/gd_interpolation.c

[Pierre Joye]

Commit:    8a85da4a61c53f012174633ea7cef38cac6cfcbe
Author:    Pierre Joye <pierre....@gmail.com>         Tue, 26 Mar 2013 17:46:29 
+0100
Parents:   3b48dc08489a2bde318836cc57c9e2c743bca5cb
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=8a85da4a61c53f012174633ea7cef38cac6cfcbe

Log:
merging conflict left over

Changed paths:
  M  ext/gd/libgd/gd_interpolation.c


Diff:
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index 4de9531..47ba5e3 100644
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@ -2213,7 +2213,6 @@ gdImagePtr gdImageRotateInterpolated(const gdImagePtr 
src, const float angle, in
                        break;
 
                default:
-                       gdImageRotateGeneric(src, angle, bgcolor);
                        return gdImageRotateGeneric(src, angle, bgcolor);
        }
        return NULL;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php