diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-10-09 14:59:37 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-10-09 15:10:34 +0200 |
| commit | b92216b97dcdae738ae24d9bdd1168565dc04406 (patch) | |
| tree | 64a820d37e2d6e5d77bd6c318be2c847a603b452 | |
| parent | 3c5742ebd735d03468048edbca434769dffec8f4 (diff) | |
| download | php-git-b92216b97dcdae738ae24d9bdd1168565dc04406.tar.gz | |
Fix #73272: imagescale() affects imagesetinterpolation()
We must not permanently change the interpolation method, but rather
have to restore the old method after we're done with scaling the image.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/gd/gd.c | 5 | ||||
| -rw-r--r-- | ext/gd/tests/bug73272.phpt | 24 | ||||
| -rw-r--r-- | ext/gd/tests/bug73272.png | bin | 0 -> 739 bytes |
4 files changed, 30 insertions, 1 deletions
@@ -4,6 +4,8 @@ PHP NEWS -GD: . Fixed bug #73213 (Integer overflow in imageline() with antialiasing). (cmb) + . Fixed bug #73272 (imagescale() is not affected by, but affects + imagesetinterpolation()). (cmb) - Standard: . Fixed bug #73203 (passing additional_parameters causes mail to fail). (cmb) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 5f086864ca..39cb4eb053 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -5175,7 +5175,7 @@ PHP_FUNCTION(imagescale) gdImagePtr im_scaled = NULL; int new_width, new_height; long tmp_w, tmp_h=-1, tmp_m = GD_BILINEAR_FIXED; - gdInterpolationMethod method; + gdInterpolationMethod method, old_method; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|ll", &IM, &tmp_w, &tmp_h, &tmp_m) == FAILURE) { return; @@ -5202,9 +5202,12 @@ PHP_FUNCTION(imagescale) new_width = tmp_w; new_height = tmp_h; + /* gdImageGetInterpolationMethod() is only available as of GD 2.1.1 */ + old_method = im->interpolation_id; if (gdImageSetInterpolationMethod(im, method)) { im_scaled = gdImageScale(im, new_width, new_height); } + gdImageSetInterpolationMethod(im, old_method); if (im_scaled == NULL) { RETURN_FALSE; diff --git a/ext/gd/tests/bug73272.phpt b/ext/gd/tests/bug73272.phpt new file mode 100644 index 0000000000..3bb710cdc7 --- /dev/null +++ b/ext/gd/tests/bug73272.phpt @@ -0,0 +1,24 @@ +--TEST--
+Bug #73272 (imagescale() is not affected by, but affects imagesetinterpolation())
+--SKIPIF--
+<?php
+if (!extension_loaded('gd')) die('skip gd extension not available');
+?>
+--FILE--
+<?php
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'func.inc';
+
+$src = imagecreatetruecolor(100, 100);
+imagefilledrectangle($src, 0,0, 99,99, 0xFFFFFF);
+imageellipse($src, 49,49, 40,40, 0x000000);
+
+imagesetinterpolation($src, IMG_NEAREST_NEIGHBOUR);
+imagescale($src, 200, 200, IMG_BILINEAR_FIXED);
+$dst = imagerotate($src, 60, 0xFFFFFF);
+
+test_image_equals_file(__DIR__ . DIRECTORY_SEPARATOR . 'bug73272.png', $dst);
+?>
+===DONE===
+--EXPECT--
+The images are equal.
+===DONE===
diff --git a/ext/gd/tests/bug73272.png b/ext/gd/tests/bug73272.png Binary files differnew file mode 100644 index 0000000000..97bfadf983 --- /dev/null +++ b/ext/gd/tests/bug73272.png |
