archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/gd: Use RETURN_BOOL() where applicable

Browse source 
Instead of an if/else
This commit is contained in:
Gina Peter Banyard 2025-04-04 21:44:58 +01:00
parent be93f29f2f
commit b647716199
1 changed files with 14 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

87
ext/gd/gd.c
View file

@ -751,11 +751,7 @@ PHP_FUNCTION(imagepalettetotruecolor)
im = php_gd_libgdimageptr_from_zval_p(IM); im = php_gd_libgdimageptr_from_zval_p(IM);
if (gdImagePaletteToTrueColor(im) == 0) { RETURN_BOOL(gdImagePaletteToTrueColor(im) != 0);
RETURN_FALSE;
}
RETURN_TRUE;
} }
/* }}} */ /* }}} */
@ -3424,22 +3420,14 @@ static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS)
{ {
PHP_GD_SINGLE_RES PHP_GD_SINGLE_RES
if (gdImageNegate(im_src) == 1) { RETURN_BOOL(gdImageNegate(im_src) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_grayscale(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_grayscale(INTERNAL_FUNCTION_PARAMETERS)
{ {
PHP_GD_SINGLE_RES PHP_GD_SINGLE_RES
if (gdImageGrayScale(im_src) == 1) { RETURN_BOOL(gdImageGrayScale(im_src) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS)
@ -3456,11 +3444,7 @@ static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS)
im_src = php_gd_libgdimageptr_from_zval_p(SIM); im_src = php_gd_libgdimageptr_from_zval_p(SIM);
if (gdImageBrightness(im_src, (int)brightness) == 1) { RETURN_BOOL(gdImageBrightness(im_src, (int)brightness) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_contrast(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_contrast(INTERNAL_FUNCTION_PARAMETERS)
@ -3477,11 +3461,7 @@ static void php_image_filter_contrast(INTERNAL_FUNCTION_PARAMETERS)
im_src = php_gd_libgdimageptr_from_zval_p(SIM); im_src = php_gd_libgdimageptr_from_zval_p(SIM);
if (gdImageContrast(im_src, (int)contrast) == 1) { RETURN_BOOL(gdImageContrast(im_src, (int)contrast) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_colorize(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_colorize(INTERNAL_FUNCTION_PARAMETERS)
@ -3503,66 +3483,42 @@ static void php_image_filter_colorize(INTERNAL_FUNCTION_PARAMETERS)
im_src = php_gd_libgdimageptr_from_zval_p(SIM); im_src = php_gd_libgdimageptr_from_zval_p(SIM);
if (gdImageColor(im_src, (int) r, (int) g, (int) b, (int) a) == 1) { RETURN_BOOL(gdImageColor(im_src, (int) r, (int) g, (int) b, (int) a) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_edgedetect(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_edgedetect(INTERNAL_FUNCTION_PARAMETERS)
{ {
PHP_GD_SINGLE_RES PHP_GD_SINGLE_RES
if (gdImageEdgeDetectQuick(im_src) == 1) { RETURN_BOOL(gdImageEdgeDetectQuick(im_src) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_emboss(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_emboss(INTERNAL_FUNCTION_PARAMETERS)
{ {
PHP_GD_SINGLE_RES PHP_GD_SINGLE_RES
if (gdImageEmboss(im_src) == 1) { RETURN_BOOL(gdImageEmboss(im_src) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_gaussian_blur(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_gaussian_blur(INTERNAL_FUNCTION_PARAMETERS)
{ {
PHP_GD_SINGLE_RES PHP_GD_SINGLE_RES
if (gdImageGaussianBlur(im_src) == 1) { RETURN_BOOL(gdImageGaussianBlur(im_src) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_selective_blur(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_selective_blur(INTERNAL_FUNCTION_PARAMETERS)
{ {
PHP_GD_SINGLE_RES PHP_GD_SINGLE_RES
if (gdImageSelectiveBlur(im_src) == 1) { RETURN_BOOL(gdImageSelectiveBlur(im_src) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_mean_removal(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_mean_removal(INTERNAL_FUNCTION_PARAMETERS)
{ {
PHP_GD_SINGLE_RES PHP_GD_SINGLE_RES
if (gdImageMeanRemoval(im_src) == 1) { RETURN_BOOL(gdImageMeanRemoval(im_src) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS)
@ -3580,11 +3536,7 @@ static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS)
im_src = php_gd_libgdimageptr_from_zval_p(SIM); im_src = php_gd_libgdimageptr_from_zval_p(SIM);
if (gdImageSmooth(im_src, (float)weight)==1) { RETURN_BOOL(gdImageSmooth(im_src, (float)weight) == 1);
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS)
@ -3604,11 +3556,7 @@ static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS)
im = php_gd_libgdimageptr_from_zval_p(IM); im = php_gd_libgdimageptr_from_zval_p(IM);
if (gdImagePixelate(im, (int) blocksize, (const unsigned int) mode)) { RETURN_BOOL(gdImagePixelate(im, (int) blocksize, (const unsigned int) mode));;
RETURN_TRUE;
}
RETURN_FALSE;
} }
static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS) static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS)
@ -3707,7 +3655,6 @@ PHP_FUNCTION(imageconvolution)
zval *var = NULL, *var2 = NULL; zval *var = NULL, *var2 = NULL;
gdImagePtr im_src = NULL; gdImagePtr im_src = NULL;
double div, offset; double div, offset;
int res;
float matrix[3][3] = {{0,0,0}, {0,0,0}, {0,0,0}}; float matrix[3][3] = {{0,0,0}, {0,0,0}, {0,0,0}};
ZEND_PARSE_PARAMETERS_START(4, 4) ZEND_PARSE_PARAMETERS_START(4, 4)
@ -3758,13 +3705,7 @@ PHP_FUNCTION(imageconvolution)
RETURN_THROWS(); RETURN_THROWS();
} }
res = gdImageConvolution(im_src, matrix, div_float, (float) offset); RETURN_BOOL(gdImageConvolution(im_src, matrix, div_float, (float) offset));
if (res) {
RETURN_TRUE;
} else {
RETURN_FALSE;
}
} }
/* }}} */ /* }}} */
/* End section: Filters */ /* End section: Filters */