Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0: fix gdImagePngCtxEx call with system libgd
nambok · Nov 25, 2021 · 80d63e9 · 80d63e9
2 parents 72f8dbb + e713890
commit 80d63e9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -4274,7 +4274,11 @@ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 			(*func_p)(im, ctx, (int) quality, (int) speed);
 			break;
 		case PHP_GDIMG_TYPE_PNG:
-			(*func_p)(im, ctx, (int) quality, (int) basefilter);
+#ifdef HAVE_GD_BUNDLED
+			gdImagePngCtxEx(im, ctx, (int) quality, (int) basefilter);
+#else
+			gdImagePngCtxEx(im, ctx, (int) quality);
+#endif
 			break;
 		case PHP_GDIMG_TYPE_GIF:
 			(*func_p)(im, ctx);