diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-01-17 21:37:56 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-01-17 21:37:56 +0000 |
| commit | 833473d1de201e3d2154c1b7ec6c9491a3635af7 (patch) | |
| tree | 8137f3bf11757ed043288837acaef657b65f9324 /ext | |
| parent | 5795ed62f4b12a4e61752f98a63cf4376d115eff (diff) | |
| download | php-git-833473d1de201e3d2154c1b7ec6c9491a3635af7.tar.gz | |
Removed pointless checks of array_init() return value.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gd/gd.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 756eb53488..32210aa021 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -494,10 +494,8 @@ PHP_FUNCTION(gd_info) RETURN_FALSE; } - if (array_init(return_value) == FAILURE) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to initialize array"); - RETURN_FALSE; - } + array_init(return_value); + #if HAVE_GD_BUNDLED add_assoc_string(return_value, "GD Version", "bundled (2.0 compatible)", 1); #elif HAVE_LIBGD20 @@ -2038,9 +2036,8 @@ PHP_FUNCTION(imagecolorsforindex) col = Z_LVAL_PP(index); #if HAVE_LIBGD20 if ((col >= 0 && gdImageTrueColor(im)) || (!gdImageTrueColor(im) && col >= 0 && col < gdImageColorsTotal(im))) { - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } + array_init(return_value); + add_assoc_long(return_value,"red", gdImageRed(im,col)); add_assoc_long(return_value,"green", gdImageGreen(im,col)); add_assoc_long(return_value,"blue", gdImageBlue(im,col)); @@ -2048,9 +2045,8 @@ PHP_FUNCTION(imagecolorsforindex) } #else if (col >= 0 && col < gdImageColorsTotal(im)) { - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } + array_init(return_value); + add_assoc_long(return_value,"red", im->red[col]); add_assoc_long(return_value,"green", im->green[col]); add_assoc_long(return_value,"blue", im->blue[col]); @@ -3060,9 +3056,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int RETURN_FALSE; } - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } + array_init(return_value); /* return array with the text's bounding box */ for (i = 0; i < 8; i++) { @@ -3441,10 +3435,7 @@ PHP_FUNCTION(imagepstext) } } - if (array_init(return_value) == FAILURE) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't initialize array for returning bounding box"); - RETURN_FALSE; - } + array_init(return_value); add_next_index_long(return_value, str_img->metrics.leftSideBearing); add_next_index_long(return_value, str_img->metrics.descent); @@ -3546,9 +3537,7 @@ PHP_FUNCTION(imagepsbbox) } if (T1_errno) RETURN_FALSE; - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; - } + array_init(return_value); /* printf("%d %d %d %d\n", str_bbox.llx, str_bbox.lly, str_bbox.urx, str_bbox.ury); */ |