[PHP-CVS] cvs: php4 /ext/gd gd.c

[Ilia Alshanetsky]

iliaa           Fri Jan 17 16:37:57 2003 EDT

  Modified files:              
    /php4/ext/gd        gd.c 
  Log:
  Removed pointless checks of array_init() return value.
  
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.244 php4/ext/gd/gd.c:1.245
--- php4/ext/gd/gd.c:1.244      Fri Jan 17 13:34:07 2003
+++ php4/ext/gd/gd.c    Fri Jan 17 16:37:56 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: gd.c,v 1.244 2003/01/17 18:34:07 iliaa Exp $ */
+/* $Id: gd.c,v 1.245 2003/01/17 21:37:56 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
    Cold Spring Harbor Labs. */
@@ -494,10 +494,8 @@
                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 @@
        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 @@
        } 
 #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 @@
                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 @@
                }
        }
 
-       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 @@
        }
        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);
        */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php