Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 20, 2025
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93e4bf5
ext/gd: array supplied to user optimisations.
devnexen Apr 20, 2025
01b736a
change from review
devnexen Apr 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions ext/gd/gd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2438,7 +2438,7 @@ PHP_FUNCTION(imagecolorsforindex)
col = index;

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,"green", gdImageGreen(im,col));
Expand Down Expand Up @@ -3303,11 +3303,12 @@ PHP_FUNCTION(imagegetclip)

gdImageGetClip(im, &x1, &y1, &x2, &y2);

array_init(return_value);
add_next_index_long(return_value, x1);
add_next_index_long(return_value, y1);
add_next_index_long(return_value, x2);
add_next_index_long(return_value, y2);
array_init_size(return_value, 4);
zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
add_index_long(return_value, 0, x1);
add_index_long(return_value, 1, y1);
add_index_long(return_value, 2, x2);
add_index_long(return_value, 3, y2);
}
/* }}} */

Expand Down Expand Up @@ -3398,11 +3399,12 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode)
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 */
for (i = 0; i < 8; i++) {
add_next_index_long(return_value, brect[i]);
add_index_long(return_value, i, brect[i]);
}
}
/* }}} */
Expand Down Expand Up @@ -4130,7 +4132,8 @@ PHP_FUNCTION(imageaffinematrixget)
if (res == GD_FALSE) {
RETURN_FALSE;
} 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++) {
add_index_double(return_value, i, affine[i]);
}
Expand Down Expand Up @@ -4196,7 +4199,8 @@ PHP_FUNCTION(imageaffinematrixconcat)
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++) {
add_index_double(return_value, i, mr[i]);
}
Expand Down Expand Up @@ -4288,9 +4292,10 @@ PHP_FUNCTION(imageresolution)
RETURN_TRUE;
}

array_init(return_value);
add_next_index_long(return_value, gdImageResolutionX(im));
add_next_index_long(return_value, gdImageResolutionY(im));
array_init_size(return_value, 2);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's zend_new_pair for an optimized version of returning a packed array of 2 elements

zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
add_index_long(return_value, 0, gdImageResolutionX(im));
add_index_long(return_value, 1, gdImageResolutionY(im));
}
/* }}} */

Expand Down
Loading