Merge branch 'PHP-8.0' into PHP-8.1

cmb69 · cmb69 · commit 67131e453b13 · 2021-09-23T23:20:00.000+02:00
* PHP-8.0:
  Fix gdAlphaMax limit typo
diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c
@@ -2625,7 +2625,7 @@ void gdImageCopyResampled (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, i
 			red = red >= 255.5 ? 255 : red+0.5;
 			blue = blue >= 255.5 ? 255 : blue+0.5;
 			green = green >= 255.5 ? 255 : green+0.5;
-			alpha = alpha >= gdAlphaMax+0.5 ? 255 : alpha+0.5;
+			alpha = alpha >= gdAlphaMax+0.5 ? gdAlphaMax : alpha+0.5;
 			gdImageSetPixel(dst, x, y, gdTrueColorAlpha ((int)red, (int)green, (int)blue, (int)alpha));
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -2625,7 +2625,7 @@ void gdImageCopyResampled (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, i`
`2625`	`2625`	`red = red >= 255.5 ? 255 : red+0.5;`
`2626`	`2626`	`blue = blue >= 255.5 ? 255 : blue+0.5;`
`2627`	`2627`	`green = green >= 255.5 ? 255 : green+0.5;`
`2628`		`- alpha = alpha >= gdAlphaMax+0.5 ? 255 : alpha+0.5;`
	`2628`	`+ alpha = alpha >= gdAlphaMax+0.5 ? gdAlphaMax : alpha+0.5;`
`2629`	`2629`	`gdImageSetPixel(dst, x, y, gdTrueColorAlpha ((int)red, (int)green, (int)blue, (int)alpha));`
`2630`	`2630`	`}`
`2631`	`2631`	`}`