com php-src: Fixed Bug #66893i imagescale ignore method argument: ext/gd/gd.c ext/gd/libgd/gd_interpolation.c
| From: | Remi Collet | Date: | Wed, 12 Mar 2014 14:35:42 +0000 |
| Subject: | com php-src: Fixed Bug #66893i imagescale ignore method argument: ext/gd/gd.c ext/gd/libgd/gd_interpolation.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76465@lists.php.net to get a copy of this message | ||
Commit: f2d5b2b6c657db29af3bc92d93645ff66574b56f
Author: Remi Collet <remi@php.net> Wed, 12 Mar 2014 15:33:41 +0100
Parents: 06bbb657ad8ae4660051da1ad698370f0c06bdc4
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f2d5b2b6c657db29af3bc92d93645ff66574b56f
Log:
Fixed Bug #66893i imagescale ignore method argument
We also have our goto fail; bug.
Upstream fix for libgd
https://bitbucket.org/libgd/gd-libgd/commits/5b42b1178c37ffd30c9a15733058656be0277da0
Bugs:
https://bugs.php.net/66893
Changed paths:
M ext/gd/gd.c
M ext/gd/libgd/gd_interpolation.c
Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 1b8366d..90a0535 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -5101,7 +5101,7 @@ PHP_FUNCTION(imagescale)
{
zval *IM;
gdImagePtr im;
- gdImagePtr im_scaled;
+ gdImagePtr im_scaled = NULL;
int new_width, new_height;
long tmp_w, tmp_h=-1, tmp_m = GD_BILINEAR_FIXED;
gdInterpolationMethod method;
@@ -5114,31 +5114,11 @@ PHP_FUNCTION(imagescale)
new_height = tmp_h;
ZEND_FETCH_RESOURCE(im, gdImagePtr, &IM, -1, "Image", le_gd);
- im_scaled = gdImageScale(im, new_width, new_height);
- goto finish;
- switch (method) {
- case GD_NEAREST_NEIGHBOUR:
- im_scaled = gdImageScaleNearestNeighbour(im, new_width, new_height);
- break;
-
- case GD_BILINEAR_FIXED:
- im_scaled = gdImageScaleBilinear(im, new_width, new_height);
- break;
-
- case GD_BICUBIC:
- im_scaled = gdImageScaleBicubicFixed(im, new_width, new_height);
- break;
-
- case GD_BICUBIC_FIXED:
- im_scaled = gdImageScaleBicubicFixed(im, new_width, new_height);
- break;
-
- default:
- im_scaled = gdImageScaleTwoPass(im, im->sx, im->sy, new_width, new_height);
- break;
+ if (gdImageSetInterpolationMethod(im, method)) {
+ im_scaled = gdImageScale(im, new_width, new_height);
}
-finish:
+
if (im_scaled == NULL) {
RETURN_FALSE;
} else {
diff --git a/ext/gd/libgd/gd_interpolation.c b/ext/gd/libgd/gd_interpolation.c
index 3643535..76327be 100644
--- a/ext/gd/libgd/gd_interpolation.c
+++ b/ext/gd/libgd/gd_interpolation.c
@@ -2472,10 +2472,7 @@ int gdImageSetInterpolationMethod(gdImagePtr im, gdInterpolationMethod id)
switch (id) {
case GD_DEFAULT:
- im->interpolation_id = GD_BILINEAR_FIXED;
- im->interpolation = NULL;
- break;
-
+ id = GD_BILINEAR_FIXED;
/* Optimized versions */
case GD_BILINEAR_FIXED:
case GD_BICUBIC_FIXED: