conflict

diff --cc ext/gd/gd.c
index e1ac2b928c5d8ccd49787531db1f89dd631d9946,23a6ec9143c76662125d3707026396255e7683db..c5a7fc883eb7c9be2269074669c3f605ae0b58e9
--- 1/ext/gd/gd.c
--- 2/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -2271,11 -2263,7 +2271,7 @@@ PHP_FUNCTION(imagerotate
  
        ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd);
  
-       if (color < 0) {
-               RETURN_FALSE;
-       }
- 
 -      im_dst = gdImageRotateInterpolated(im_src, (float)degrees, color);
 +      im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color);
  
        if (im_dst != NULL) {
                ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd);

diff --cc ext/gd/libgd/gd.h
Simple merge

diff --cc ext/gd/libgd/gd_interpolation.c
Simple merge