]> granicus.if.org Git - php/commitdiff
zstr should be used here, this nukes another compiler warning
authorKalle Sommer Nielsen <kalle@php.net>
Thu, 28 May 2009 20:53:09 +0000 (20:53 +0000)
committerKalle Sommer Nielsen <kalle@php.net>
Thu, 28 May 2009 20:53:09 +0000 (20:53 +0000)
ext/gd/gd.c

index 99b97713cf175939bbea2cef8b9554457fe19429..4ffefc382b2df1d5e0f2940a2402434c40367cb2 100644 (file)
@@ -3624,7 +3624,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
                zend_hash_internal_pointer_reset_ex(HASH_OF(EXT), &pos);
                do {
                        zval ** item;
-                       char * key;
+                       zstr key;
                        ulong num_key;
 
                        if (zend_hash_get_current_key_ex(HASH_OF(EXT), &key, NULL, &num_key, 0, &pos) != HASH_KEY_IS_STRING) {
@@ -3635,7 +3635,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
                                continue;
                        }
                
-                       if (strcmp("linespacing", key) == 0) {
+                       if (strcmp("linespacing", key.s) == 0) {
                                convert_to_double_ex(item);
                                strex.flags |= gdFTEX_LINESPACE;
                                strex.linespacing = Z_DVAL_PP(item);