Skip to content

ext/gd: Various minor refactorings #18251

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 6 commits into from
Apr 5, 2025
Merged

ext/gd: Various minor refactorings #18251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1fbeb10
ext/gd: Mark return types as true instead of bool
Girgias Apr 4, 2025
2de4e88
ext/gd: Remove useless ext/standard header include
Girgias Apr 4, 2025
728d281
ext/gd: Use uint32_t type instead of int type
Girgias Apr 4, 2025
fb1ac55
ext/gd: Reduce scope of variables
Girgias Apr 4, 2025
334f0a4
ext/gd: Use RETURN_BOOL() where applicable
Girgias Apr 4, 2025
3f4bd0e
ext/gd: Move FREETYPE defines into the ifdef
Girgias Apr 4, 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
140 changes: 37 additions & 103 deletions ext/gd/gd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

#include "php.h"
#include "php_ini.h"
#include "ext/standard/head.h"
#include <math.h>
#include "SAPI.h"
#include "php_gd.h"
Expand Down Expand Up @@ -752,11 +751,7 @@ PHP_FUNCTION(imagepalettetotruecolor)

im = php_gd_libgdimageptr_from_zval_p(IM);

if (gdImagePaletteToTrueColor(im) == 0) {
RETURN_FALSE;
}

RETURN_TRUE;
RETURN_BOOL(gdImagePaletteToTrueColor(im) != 0);
}
/* }}} */

Expand Down Expand Up @@ -1754,7 +1749,6 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, cons
char *file = NULL;
zend_long quality = 128, type = 1;
gdImagePtr im;
FILE *fp;
size_t file_len = 0;

/* The quality parameter for gd2 stands for chunk size */
Expand Down Expand Up @@ -1784,7 +1778,7 @@ static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, cons
if (file_len) {
PHP_GD_CHECK_OPEN_BASEDIR(file, "Invalid filename");

fp = VCWD_FOPEN(file, "wb");
FILE *fp = VCWD_FOPEN(file, "wb");
if (!fp) {
php_error_docref(NULL, E_WARNING, "Unable to open \"%s\" for writing", file);
RETURN_FALSE;
Expand Down Expand Up @@ -1852,9 +1846,7 @@ PHP_FUNCTION(imagexbm)
zend_long foreground_color;
bool foreground_color_is_null = true;
gdImagePtr im;
int i;
gdIOCtx *ctx = NULL;
php_stream *stream;

ZEND_PARSE_PARAMETERS_START(2, 3)
Z_PARAM_OBJECT_OF_CLASS(imgind, gd_image_ce)
Expand All @@ -1866,7 +1858,7 @@ PHP_FUNCTION(imagexbm)
im = php_gd_libgdimageptr_from_zval_p(imgind);

if (file != NULL) {
stream = php_stream_open_wrapper(file, "wb", REPORT_ERRORS|IGNORE_PATH, NULL);
php_stream *stream = php_stream_open_wrapper(file, "wb", REPORT_ERRORS|IGNORE_PATH, NULL);
if (stream == NULL) {
RETURN_FALSE;
}
Expand All @@ -1877,6 +1869,7 @@ PHP_FUNCTION(imagexbm)
}

if (foreground_color_is_null) {
int i;
for (i = 0; i < gdImageColorsTotal(im); i++) {
if (!gdImageRed(im, i) && !gdImageGreen(im, i) && !gdImageBlue(im, i)) {
break;
Expand Down Expand Up @@ -2084,7 +2077,6 @@ PHP_FUNCTION(imagewbmp)
zend_long foreground_color;
bool foreground_color_is_null = true;
gdImagePtr im;
int i;
gdIOCtx *ctx;
zval *to_zval = NULL;

Expand All @@ -2103,6 +2095,7 @@ PHP_FUNCTION(imagewbmp)
}

if (foreground_color_is_null) {
int i;
for (i = 0; i < gdImageColorsTotal(im); i++) {
if (!gdImageRed(im, i) && !gdImageGreen(im, i) && !gdImageBlue(im, i)) {
break;
Expand Down Expand Up @@ -2463,7 +2456,6 @@ PHP_FUNCTION(imagegammacorrect)
{
zval *IM;
gdImagePtr im;
int i;
double input, output, gamma;

ZEND_PARSE_PARAMETERS_START(3, 3)
Expand All @@ -2487,11 +2479,9 @@ PHP_FUNCTION(imagegammacorrect)
im = php_gd_libgdimageptr_from_zval_p(IM);

if (gdImageTrueColor(im)) {
int x, y, c;

for (y = 0; y < gdImageSY(im); y++) {
for (x = 0; x < gdImageSX(im); x++) {
c = gdImageGetPixel(im, x, y);
for (int y = 0; y < gdImageSY(im); y++) {
for (int x = 0; x < gdImageSX(im); x++) {
int c = gdImageGetPixel(im, x, y);
gdImageSetPixel(im, x, y,
gdTrueColorAlpha(
(int) ((pow((gdTrueColorGetRed(c) / 255.0), gamma) * 255) + .5),
Expand All @@ -2505,7 +2495,7 @@ PHP_FUNCTION(imagegammacorrect)
RETURN_TRUE;
}

for (i = 0; i < gdImageColorsTotal(im); i++) {
for (int i = 0; i < gdImageColorsTotal(im); i++) {
im->red[i] = (int)((pow((im->red[i] / 255.0), gamma) * 255) + .5);
im->green[i] = (int)((pow((im->green[i] / 255.0), gamma) * 255) + .5);
im->blue[i] = (int)((pow((im->blue[i] / 255.0), gamma) * 255) + .5);
Expand Down Expand Up @@ -2811,7 +2801,7 @@ static void php_imagepolygon(INTERNAL_FUNCTION_PARAMETERS, int filled)
zval *var = NULL;
gdImagePtr im;
gdPointPtr points;
int npoints, col, nelem, i;
int npoints, col, nelem;

ZEND_PARSE_PARAMETERS_START(3, 4)
Z_PARAM_OBJECT_OF_CLASS(IM, gd_image_ce)
Expand Down Expand Up @@ -2851,7 +2841,7 @@ static void php_imagepolygon(INTERNAL_FUNCTION_PARAMETERS, int filled)

points = (gdPointPtr) safe_emalloc(npoints, sizeof(gdPoint), 0);

for (i = 0; i < npoints; i++) {
for (int i = 0; i < npoints; i++) {
if ((var = zend_hash_index_find(Z_ARRVAL_P(POINTS), (i * 2))) != NULL) {
points[i].x = zval_get_long(var);
}
Expand Down Expand Up @@ -3321,10 +3311,11 @@ PHP_FUNCTION(imagegetclip)
}
/* }}} */

#ifdef HAVE_GD_FREETYPE

#define TTFTEXT_DRAW 0
#define TTFTEXT_BBOX 1

#ifdef HAVE_GD_FREETYPE
/* {{{ Give the bounding box of a text using fonts via freetype2 */
PHP_FUNCTION(imageftbbox)
{
Expand Down Expand Up @@ -3419,22 +3410,14 @@ static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS)
{
PHP_GD_SINGLE_RES

if (gdImageNegate(im_src) == 1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageNegate(im_src) == 1);
}

static void php_image_filter_grayscale(INTERNAL_FUNCTION_PARAMETERS)
{
PHP_GD_SINGLE_RES

if (gdImageGrayScale(im_src) == 1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageGrayScale(im_src) == 1);
}

static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS)
Expand All @@ -3451,11 +3434,7 @@ static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS)

im_src = php_gd_libgdimageptr_from_zval_p(SIM);

if (gdImageBrightness(im_src, (int)brightness) == 1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageBrightness(im_src, (int)brightness) == 1);
}

static void php_image_filter_contrast(INTERNAL_FUNCTION_PARAMETERS)
Expand All @@ -3472,11 +3451,7 @@ static void php_image_filter_contrast(INTERNAL_FUNCTION_PARAMETERS)

im_src = php_gd_libgdimageptr_from_zval_p(SIM);

if (gdImageContrast(im_src, (int)contrast) == 1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageContrast(im_src, (int)contrast) == 1);
}

static void php_image_filter_colorize(INTERNAL_FUNCTION_PARAMETERS)
Expand All @@ -3498,66 +3473,42 @@ static void php_image_filter_colorize(INTERNAL_FUNCTION_PARAMETERS)

im_src = php_gd_libgdimageptr_from_zval_p(SIM);

if (gdImageColor(im_src, (int) r, (int) g, (int) b, (int) a) == 1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageColor(im_src, (int) r, (int) g, (int) b, (int) a) == 1);
}

static void php_image_filter_edgedetect(INTERNAL_FUNCTION_PARAMETERS)
{
PHP_GD_SINGLE_RES

if (gdImageEdgeDetectQuick(im_src) == 1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageEdgeDetectQuick(im_src) == 1);
}

static void php_image_filter_emboss(INTERNAL_FUNCTION_PARAMETERS)
{
PHP_GD_SINGLE_RES

if (gdImageEmboss(im_src) == 1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageEmboss(im_src) == 1);
}

static void php_image_filter_gaussian_blur(INTERNAL_FUNCTION_PARAMETERS)
{
PHP_GD_SINGLE_RES

if (gdImageGaussianBlur(im_src) == 1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageGaussianBlur(im_src) == 1);
}

static void php_image_filter_selective_blur(INTERNAL_FUNCTION_PARAMETERS)
{
PHP_GD_SINGLE_RES

if (gdImageSelectiveBlur(im_src) == 1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageSelectiveBlur(im_src) == 1);
}

static void php_image_filter_mean_removal(INTERNAL_FUNCTION_PARAMETERS)
{
PHP_GD_SINGLE_RES

if (gdImageMeanRemoval(im_src) == 1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageMeanRemoval(im_src) == 1);
}

static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS)
Expand All @@ -3575,11 +3526,7 @@ static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS)

im_src = php_gd_libgdimageptr_from_zval_p(SIM);

if (gdImageSmooth(im_src, (float)weight)==1) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImageSmooth(im_src, (float)weight) == 1);
}

static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS)
Expand All @@ -3599,11 +3546,7 @@ static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS)

im = php_gd_libgdimageptr_from_zval_p(IM);

if (gdImagePixelate(im, (int) blocksize, (const unsigned int) mode)) {
RETURN_TRUE;
}

RETURN_FALSE;
RETURN_BOOL(gdImagePixelate(im, (int) blocksize, (const unsigned int) mode));;
}

static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS)
Expand Down Expand Up @@ -3702,7 +3645,6 @@ PHP_FUNCTION(imageconvolution)
zval *var = NULL, *var2 = NULL;
gdImagePtr im_src = NULL;
double div, offset;
int nelem, i, j, res;
float matrix[3][3] = {{0,0,0}, {0,0,0}, {0,0,0}};

ZEND_PARSE_PARAMETERS_START(4, 4)
Expand All @@ -3714,20 +3656,19 @@ PHP_FUNCTION(imageconvolution)

im_src = php_gd_libgdimageptr_from_zval_p(SIM);

nelem = zend_hash_num_elements(Z_ARRVAL_P(hash_matrix));
if (nelem != 3) {
if (zend_hash_num_elements(Z_ARRVAL_P(hash_matrix)) != 3) {
zend_argument_value_error(2, "must be a 3x3 array");
RETURN_THROWS();
}

for (i=0; i<3; i++) {
for (uint8_t i = 0; i < 3; i++) {
if ((var = zend_hash_index_find_deref(Z_ARRVAL_P(hash_matrix), (i))) != NULL && Z_TYPE_P(var) == IS_ARRAY) {
if (zend_hash_num_elements(Z_ARRVAL_P(var)) != 3 ) {
zend_argument_value_error(2, "must be a 3x3 array, matrix[%d] only has %d elements", i, zend_hash_num_elements(Z_ARRVAL_P(var)));
RETURN_THROWS();
}

for (j=0; j<3; j++) {
for (uint8_t j = 0; j < 3; j++) {
if ((var2 = zend_hash_index_find(Z_ARRVAL_P(var), j)) != NULL) {
matrix[i][j] = (float) zval_get_double(var2);
} else {
Expand All @@ -3754,13 +3695,7 @@ PHP_FUNCTION(imageconvolution)
RETURN_THROWS();
}

res = gdImageConvolution(im_src, matrix, div_float, (float) offset);

if (res) {
RETURN_TRUE;
} else {
RETURN_FALSE;
}
RETURN_BOOL(gdImageConvolution(im_src, matrix, div_float, (float) offset));
}
/* }}} */
/* End section: Filters */
Expand Down Expand Up @@ -4033,10 +3968,7 @@ PHP_FUNCTION(imageaffine)
gdRectPtr pRect = NULL;
zval *z_rect = NULL;
zval *z_affine;
zval *tmp;
double affine[6];
int i, nelems;
zval *zval_affine_elem = NULL;

ZEND_PARSE_PARAMETERS_START(2, 3)
Z_PARAM_OBJECT_OF_CLASS(IM, gd_image_ce)
Expand All @@ -4047,14 +3979,15 @@ PHP_FUNCTION(imageaffine)


src = php_gd_libgdimageptr_from_zval_p(IM);

if ((nelems = zend_hash_num_elements(Z_ARRVAL_P(z_affine))) != 6) {
uint32_t nelems = zend_hash_num_elements(Z_ARRVAL_P(z_affine));
if (nelems != 6) {
zend_argument_value_error(2, "must have 6 elements");
RETURN_THROWS();
}

for (i = 0; i < nelems; i++) {
if ((zval_affine_elem = zend_hash_index_find_deref(Z_ARRVAL_P(z_affine), i)) != NULL) {
for (uint32_t i = 0; i < nelems; i++) {
Copy link
Member

Choose a reason for hiding this comment

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

looking good so far, I think you can do the same stripping down you did above, i.e. we want 6 elements from the matrix.

Copy link
Member Author

Choose a reason for hiding this comment

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

The main reason I use uint32_t here is that we are comparing it to nelems which is a uint32_t

Copy link
Member

Choose a reason for hiding this comment

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

I meant more something like

for (uint32_t i = 0; i < 6; i ++) ..

to save the variable like you did above.

Copy link
Member Author

Choose a reason for hiding this comment

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

But I did this, (in a follow-up commit from the one you reviewed?)

zval *zval_affine_elem = zend_hash_index_find_deref(Z_ARRVAL_P(z_affine), i);
if (zval_affine_elem != NULL) {
switch (Z_TYPE_P(zval_affine_elem)) {
case IS_LONG:
case IS_DOUBLE:
Expand All @@ -4073,6 +4006,7 @@ PHP_FUNCTION(imageaffine)
}

if (z_rect != NULL) {
zval *tmp;
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "x", sizeof("x") - 1)) != NULL) {
rect.x = zval_get_long(tmp);
} else {
Expand Down Expand Up @@ -4122,7 +4056,7 @@ PHP_FUNCTION(imageaffinematrixget)
zend_long type;
zval *options = NULL;
zval *tmp;
int res = GD_FALSE, i;
int res = GD_FALSE;

ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_LONG(type)
Expand Down Expand Up @@ -4186,7 +4120,7 @@ PHP_FUNCTION(imageaffinematrixget)
RETURN_FALSE;
} else {
array_init(return_value);
for (i = 0; i < 6; i++) {
for (uint8_t i = 0; i < 6; i++) {
add_index_double(return_value, i, affine[i]);
}
}
Expand Down
Loading
Loading