archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/gd: array supplied to user optimisations. (#18366)

Browse source 
explictly allocate packed arrays when it applies.
This commit is contained in:
David CARLIER 2025-04-20 17:30:12 +01:00 • committed by GitHub
parent eeaa60f6fa
commit 2c3a2da48a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ext/gd/gd.c
View file

@ -2438,7 +2438,7 @@ PHP_FUNCTION(imagecolorsforindex)
col = index; col = index;
if ((col >= 0 && gdImageTrueColor(im)) || (!gdImageTrueColor(im) && col >= 0 && col < gdImageColorsTotal(im))) { if ((col >= 0 && gdImageTrueColor(im)) || (!gdImageTrueColor(im) && col >= 0 && col < gdImageColorsTotal(im))) {
array_init(return_value); array_init_size(return_value, 4);
add_assoc_long(return_value,"red", gdImageRed(im,col)); add_assoc_long(return_value,"red", gdImageRed(im,col));
add_assoc_long(return_value,"green", gdImageGreen(im,col)); add_assoc_long(return_value,"green", gdImageGreen(im,col));
@ -3303,11 +3303,12 @@ PHP_FUNCTION(imagegetclip)
gdImageGetClip(im, &x1, &y1, &x2, &y2); gdImageGetClip(im, &x1, &y1, &x2, &y2);
array_init(return_value); array_init_size(return_value, 4);
add_next_index_long(return_value, x1); zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
add_next_index_long(return_value, y1); add_index_long(return_value, 0, x1);
add_next_index_long(return_value, x2); add_index_long(return_value, 1, y1);
add_next_index_long(return_value, y2); add_index_long(return_value, 2, x2);
add_index_long(return_value, 3, y2);
} }
/* }}} */ /* }}} */
@ -3398,11 +3399,12 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode)
RETURN_FALSE; RETURN_FALSE;
} }
array_init(return_value); array_init_size(return_value, 8);
zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
/* return array with the text's bounding box */ /* return array with the text's bounding box */
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
add_next_index_long(return_value, brect[i]); add_index_long(return_value, i, brect[i]);
} }
} }
/* }}} */ /* }}} */
@ -4130,7 +4132,8 @@ PHP_FUNCTION(imageaffinematrixget)
if (res == GD_FALSE) { if (res == GD_FALSE) {
RETURN_FALSE; RETURN_FALSE;
} else { } else {
array_init(return_value); array_init_size(return_value, 6);
zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
for (uint8_t i = 0; i < 6; i++) { for (uint8_t i = 0; i < 6; i++) {
add_index_double(return_value, i, affine[i]); add_index_double(return_value, i, affine[i]);
} }
@ -4196,7 +4199,8 @@ PHP_FUNCTION(imageaffinematrixconcat)
RETURN_FALSE; RETURN_FALSE;
} }
array_init(return_value); array_init_size(return_value, 6);
zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
add_index_double(return_value, i, mr[i]); add_index_double(return_value, i, mr[i]);
} }
@ -4288,9 +4292,10 @@ PHP_FUNCTION(imageresolution)
RETURN_TRUE; RETURN_TRUE;
} }
array_init(return_value); zval imx, imy;
add_next_index_long(return_value, gdImageResolutionX(im)); ZVAL_LONG(&imx, gdImageResolutionX(im));
add_next_index_long(return_value, gdImageResolutionY(im)); ZVAL_LONG(&imy, gdImageResolutionY(im));
RETURN_ARR(zend_new_pair(&imx, &imy));
} }
/* }}} */ /* }}} */