com php-src: fix conflict: ext/gd/libgd/gd_interpolation.c
| From: | Pierre Joye | Date: | Sun, 24 Mar 2013 15:54:55 +0000 |
| Subject: | com php-src: fix conflict: ext/gd/libgd/gd_interpolation.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71714@lists.php.net to get a copy of this message | ||
Commit: 94c083ba645c77faa677c2ced7e2b5e8b94c3ebc
Author: Pierre Joye <pierre.php@gmail.com> Sun, 24 Mar 2013 16:54:55 +0100
Parents: 453bcfecbfdd95e5e5449b7d0ae8f6f0cb5b1cea be3e2bb295d58297ce7e8a3ee05cbf2112eb0138
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94c083ba645c77faa677c2ced7e2b5e8b94c3ebc
Log:
fix conflict
Changed paths:
MM ext/gd/libgd/gd_interpolation..c
Diff:
diff --cc ext/gd/libgd/gd_interpolation.c
index e1c8728,15b5415..77d7dd1
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@@ -2220,7 -2207,7 +2221,8 @@@ gdImagePtr gdImageRotateInterpolated(co
break;
default:
+ gdImageRotateGeneric(src, angle, bgcolor);
+ return gdImageRotateGeneric(src, angle, bgcolor);
}
return NULL;
}