diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2015-06-06 14:57:38 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2015-06-17 02:15:59 +0200 |
| commit | 7469c7e7d0cee78abfaeeb087be494939bee82a9 (patch) | |
| tree | 22eaf6a696c50d44869a3d1ada7413d113c50e21 | |
| parent | 558342124efe5ed3a31dd0d85f2baf40f953ac6d (diff) | |
| download | php-git-7469c7e7d0cee78abfaeeb087be494939bee82a9.tar.gz | |
Fixed bug #61221 - imagegammacorrect function loses alpha channel
When applying imagegammacorrect() the alpha channel is now fully retained, instead of being completely lost.
| -rw-r--r-- | ext/gd/gd.c | 5 | ||||
| -rw-r--r-- | ext/gd/tests/bug61221.phpt | 23 |
2 files changed, 26 insertions, 2 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 76e2c5bf55..405229e4ee 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -3045,10 +3045,11 @@ PHP_FUNCTION(imagegammacorrect) for (x = 0; x < gdImageSX(im); x++) { c = gdImageGetPixel(im, x, y); gdImageSetPixel(im, x, y, - gdTrueColor( + gdTrueColorAlpha( (int) ((pow((pow((gdTrueColorGetRed(c) / 255.0), input)), 1.0 / output) * 255) + .5), (int) ((pow((pow((gdTrueColorGetGreen(c) / 255.0), input)), 1.0 / output) * 255) + .5), - (int) ((pow((pow((gdTrueColorGetBlue(c) / 255.0), input)), 1.0 / output) * 255) + .5) + (int) ((pow((pow((gdTrueColorGetBlue(c) / 255.0), input)), 1.0 / output) * 255) + .5), + gdTrueColorGetAlpha(c) ) ); } diff --git a/ext/gd/tests/bug61221.phpt b/ext/gd/tests/bug61221.phpt new file mode 100644 index 0000000000..42365da71f --- /dev/null +++ b/ext/gd/tests/bug61221.phpt @@ -0,0 +1,23 @@ +--TEST-- +Bug #61221 - imagegammacorrect function loses alpha channel +--SKIPIF-- +<?php +if (!extension_loaded('gd')) die('skip gd extension not available'); +?> +--FILE-- +<?php +$imagew = 50; +$imageh = 50; +$img = imagecreatetruecolor($imagew, $imageh); +$blacktransparent = imagecolorallocatealpha($img, 0, 0, 0, 127); +$redsolid = imagecolorallocate($img, 255, 0, 0); +imagefill($img, 0, 0, $blacktransparent); +imageline($img, $imagew / 2, 0, $imagew / 2, $imageh - 1, $redsolid); +imageline($img, 0, $imageh / 2, $imagew - 1, $imageh / 2, $redsolid); +imagegammacorrect($img, 1, 1); +$color = imagecolorat($img, 0, 0); +var_dump($color === $blacktransparent); +imagedestroy($img); +?> +--EXPECT-- +bool(true) |