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

2013-03-26 Thread Pierre Joye 
Commit:23af4ff5bba76bc06066375a93c0babf84ac
Author:Pierre Joye pierre@gmail.com Tue, 26 Mar 2013 11:24:00 
+0100
Parents:   b6fa581d2de04b850129ad669b44865de4aef429 
5ae6f582fb9af6e93ecd7001646553ae98be6275
Branches:  master

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

Log:
conflict

Changed paths:
  MM  ext/gd/gd.c
  MM  ext/gd/libgd/gd.h
  MM  ext/gd/libgd/gd_interpolation.c


Diff:
diff --cc ext/gd/gd.c
index e1ac2b9,23a6ec9..c5a7fc8
--- 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);


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

[PHP-CVS] com php-src: fix regression, take #2 (merge issue due to git 1.8 default setting changes): ext/gd/gd.c ext/gd/libgd/gd.h ext/gd/libgd/gd_interpolation.c

2013-03-26 Thread Pierre Joye 
Commit:5ae6f582fb9af6e93ecd7001646553ae98be6275
Author:Pierre Joye pierre@gmail.com Tue, 26 Mar 2013 11:23:15 
+0100
Parents:   c6e911e1549ba23158249ef1c0e6f27dcc6c88bb
Branches:  PHP-5.5 master

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

Log:
fix regression, take #2 (merge issue due to git 1.8 default setting changes)

Bugs:
https://bugs.php.net/2

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


Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index caf84e3..23a6ec9 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2263,7 +2263,7 @@ PHP_FUNCTION(imagerotate)
 
ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, Image, le_gd);
 
-   im_dst = gdImageRotateGeneric(im_src, (float)degrees, color);
+   im_dst = gdImageRotateInterpolated(im_src, (float)degrees, color);
 
if (im_dst != NULL) {
ZEND_REGISTER_RESOURCE(return_value, im_dst, le_gd);
diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h
index 28c8562..0bd8ad3 100644
--- a/ext/gd/libgd/gd.h
+++ b/ext/gd/libgd/gd.h
@@ -690,6 +690,7 @@ gdImagePtr gdImageRotate180(gdImagePtr src, int 
ignoretransparent);
 gdImagePtr gdImageRotate270(gdImagePtr src, int ignoretransparent);
 gdImagePtr gdImageRotate45(gdImagePtr src, double dAngle, int clrBack, int 
ignoretransparent);
 gdImagePtr gdImageRotate (gdImagePtr src, double dAngle, int clrBack, int 
ignoretransparent);
+gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, 
int bgcolor);
 
 void gdImageSetBrush(gdImagePtr im, gdImagePtr brush);
 void gdImageSetTile(gdImagePtr im, gdImagePtr tile);
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index c88dc72..d805ec9 100644
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@ -2166,6 +2166,10 @@ gdImagePtr gdImageRotateBicubicFixed(gdImagePtr src, 
const float degrees, const
 gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, 
int bgcolor)
 {
const int angle_rounded = (int)floor(angle * 100);
+   
+   if (bgcolor  0) {
+   return NULL;
+   }
 
/* no interpolation needed here */
switch (angle_rounded) {


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

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

2013-03-26 Thread 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

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

2013-03-26 Thread Pierre Joye 
Commit:705ab202522bda22e0bda2370ac9591fe3c83cb8
Author:Pierre Joye pierre@gmail.com Wed, 27 Mar 2013 05:13:42 
+0100
Parents:   8a85da4a61c53f012174633ea7cef38cac6cfcbe 
f3ebb40ad6041e9c29e165f9d7017fb50063129f
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  FALSE on error

Changed paths:
  MM  ext/gd/gd.c


Diff:



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

[PHP-CVS] com php-src: FALSE on error: ext/gd/gd.c

2013-03-26 Thread Pierre Joye 
Commit:f3ebb40ad6041e9c29e165f9d7017fb50063129f
Author:Pierre Joye pierre@gmail.com Wed, 27 Mar 2013 05:13:30 
+0100
Parents:   4d73bb070ee90336984f275eb24f7d1ca1cff1ea
Branches:  PHP-5.5 master

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

Log:
 FALSE on error

Changed paths:
  M  ext/gd/gd.c


Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 23a6ec9..3ce1a2c 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1814,7 +1814,7 @@ PHP_FUNCTION(imagepalettetotruecolor)
ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd);
 
if (gdImagePaletteToTrueColor(im) == 0) {
-   RETURN_TRUE;
+   RETURN_FALSE;
}
 
RETURN_TRUE;


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