From: Pierre Joye <pierre.php@gmail.com>
Date: Tue, 26 Mar 2013 10:24:00 +0000 (+0100)
Subject: conflict
X-Git-Tag: php-5.6.0alpha1~448^2~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=111123af4ff5bba76bc06066375a93c0babf84ac;p=php

conflict
---

111123af4ff5bba76bc06066375a93c0babf84ac
diff --cc ext/gd/gd.c
index e1ac2b928c,23a6ec9143..c5a7fc883e
--- a/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);