archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Fix GH-10614: imagerotate will turn the picture all black, when rotated 90
This commit is contained in:
Niels Dossche 2024-01-26 18:16:21 +01:00
commit b76ef301a0
4 changed files with 98 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -21,6 +21,8 @@ PHP NEWS
- GD: - GD:
. Fixed bug GH-10344 (imagettfbbox(): Could not find/open font UNC path). . Fixed bug GH-10344 (imagettfbbox(): Could not find/open font UNC path).
(nielsdos) (nielsdos)
. Fixed bug GH-10614 (imagerotate will turn the picture all black, when
rotated 90). (nielsdos)
- LibXML: - LibXML:
. Fix crashes with entity references and predefined entities. (nielsdos) . Fix crashes with entity references and predefined entities. (nielsdos)

6
ext/gd/libgd/gd_rotate.c
View file

@ -216,7 +216,7 @@ gdImagePtr gdImageRotate90 (gdImagePtr src, int ignoretransparent)
if (dst != NULL) { if (dst != NULL) {
int old_blendmode = dst->alphaBlendingFlag; int old_blendmode = dst->alphaBlendingFlag;
dst->alphaBlendingFlag = 0; dst->alphaBlendingFlag = 0;
dst->saveAlphaFlag = 1;
dst->transparent = src->transparent; dst->transparent = src->transparent;
gdImagePaletteCopy (dst, src); gdImagePaletteCopy (dst, src);
@ -263,7 +263,7 @@ gdImagePtr gdImageRotate180 (gdImagePtr src, int ignoretransparent)
if (dst != NULL) { if (dst != NULL) {
int old_blendmode = dst->alphaBlendingFlag; int old_blendmode = dst->alphaBlendingFlag;
dst->alphaBlendingFlag = 0; dst->alphaBlendingFlag = 0;
dst->saveAlphaFlag = 1;
dst->transparent = src->transparent; dst->transparent = src->transparent;
gdImagePaletteCopy (dst, src); gdImagePaletteCopy (dst, src);
@ -311,7 +311,7 @@ gdImagePtr gdImageRotate270 (gdImagePtr src, int ignoretransparent)
if (dst != NULL) { if (dst != NULL) {
int old_blendmode = dst->alphaBlendingFlag; int old_blendmode = dst->alphaBlendingFlag;
dst->alphaBlendingFlag = 0; dst->alphaBlendingFlag = 0;
dst->saveAlphaFlag = 1;
dst->transparent = src->transparent; dst->transparent = src->transparent;
gdImagePaletteCopy (dst, src); gdImagePaletteCopy (dst, src);

93
ext/gd/tests/gh10614.phpt Normal file
View file

@ -0,0 +1,93 @@
--TEST--
GH-10614 (imagerotate will turn the picture all black, when rotated 90)
--EXTENSIONS--
gd
--SKIPIF--
<?php
if (!GD_BUNDLED && version_compare(GD_VERSION, '2.3.4', '>=')) die("skip test requires GD 2.3.4 or older");
?>
--FILE--
<?php
$input = imagecreatefrompng(__DIR__ . '/gh10614.png');
for ($angle = 0; $angle <= 270; $angle += 90) {
echo "--- Angle $angle ---\n";
$output = imagerotate($input, $angle, 0);
for ($i = 0; $i < 4; $i++) {
for ($j = 0; $j < 4; $j++) {
var_dump(dechex(imagecolorat($output, $i, $j)));
}
}
}
?>
--EXPECT--
--- Angle 0 ---
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
--- Angle 90 ---
string(8) "7f000000"
string(8) "7f000000"
string(1) "0"
string(1) "0"
string(8) "7f000000"
string(8) "7f000000"
string(1) "0"
string(1) "0"
string(8) "7f000000"
string(8) "7f000000"
string(1) "0"
string(1) "0"
string(8) "7f000000"
string(8) "7f000000"
string(1) "0"
string(1) "0"
--- Angle 180 ---
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(8) "7f000000"
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
--- Angle 270 ---
string(1) "0"
string(1) "0"
string(8) "7f000000"
string(8) "7f000000"
string(1) "0"
string(1) "0"
string(8) "7f000000"
string(8) "7f000000"
string(1) "0"
string(1) "0"
string(8) "7f000000"
string(8) "7f000000"
string(1) "0"
string(1) "0"
string(8) "7f000000"
string(8) "7f000000"

BIN
ext/gd/tests/gh10614.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 98 B