- fix regression (imagerotate_overflow.phpt), fix for all cases

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 58027d7d0d6216e1a31111cee3cd9326057a6fff..74ce32c8504d87132dfa6732074e563ac7635372 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2271,6 +2271,10 @@ PHP_FUNCTION(imagerotate)
 
        ZEND_FETCH_RESOURCE(im_src, gdImagePtr, &SIM, -1, "Image", le_gd);
 
+       if (color < 0) {
+               RETURN_FALSE;
+       }
+
        im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color);
 
        if (im_dst != NULL) {

diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index 0215c23369cb64104c267e64ec6785d706d14db6..e1c87282fd081d8420b1545b1ea204a8cffd1e0b 100644 (file)
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@ -825,10 +825,6 @@ int getPixelInterpolated(gdImagePtr im, const double x, const double y, const in
                return -1;
        }
 
-       /* Default to full alpha */
-       if (bgColor == -1) {
-       }
-
        if (im->interpolation_id == GD_WEIGHTED4) {
                return getPixelInterpolateWeight(im, x, y, bgColor);
        }