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

[Ilia Alshanetsky]

iliaa           Fri Jan 24 11:23:12 2003 EDT

  Modified files:              
    /php4/ext/gd        gd.c 
  Log:
  Fixed compile warning.
  
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.246 php4/ext/gd/gd.c:1.247
--- php4/ext/gd/gd.c:1.246      Wed Jan 22 14:53:29 2003
+++ php4/ext/gd/gd.c    Fri Jan 24 11:23:11 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: gd.c,v 1.246 2003/01/22 19:53:29 iliaa Exp $ */
+/* $Id: gd.c,v 1.247 2003/01/24 16:23:11 iliaa Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, 
    Cold Spring Harbor Labs. */
@@ -3301,15 +3301,15 @@
        GLYPH *str_img;
        T1_OUTLINE *char_path, *str_path;
        T1_TMATRIX *transform = NULL;
-       char *_str;
-       int _str_len;
+       char *str;
+       int str_len;
        int argc = ZEND_NUM_ARGS();
        
        if (argc != 8 && argc != 12) {
                ZEND_WRONG_PARAM_COUNT();
        }
        
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsrlllll|lldl", &img, &_str, 
&_str_len, &fnt, &size, &_fg, &_bg, &x, &y, &space, &width, &angle, &aa_steps) == 
FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsrlllll|lldl", &img, 
+&str, &str_len, &fnt, &size, &_fg, &_bg, &x, &y, &space, &width, &angle, &aa_steps) 
+== FAILURE) {
                return;
        }
 
@@ -3383,7 +3383,7 @@
        }
 
        extend = T1_GetExtend(*f_ind);
-       str_path = T1_GetCharOutline(*f_ind, _str[0], size, transform);
+       str_path = T1_GetCharOutline(*f_ind, str[0], size, transform);
 
        if (!str_path) {
                if (T1_errno) {
@@ -3392,15 +3392,15 @@
                RETURN_FALSE;
        }
 
-       for (i = 1; i < _str_len; i++) {
-               amount_kern = (int) T1_GetKerning(*f_ind, _str[i-1], _str[i]);
-               amount_kern += _str[i-1] == ' ' ? space : 0;
+       for (i = 1; i < str_len; i++) {
+               amount_kern = (int) T1_GetKerning(*f_ind, str[i-1], str[i]);
+               amount_kern += str[i-1] == ' ' ? space : 0;
                add_width = (int) (amount_kern+width)/extend;
 
                char_path = T1_GetMoveOutline(*f_ind, add_width, 0, 0, size, 
transform);
                str_path = T1_ConcatOutlines(str_path, char_path);
 
-               char_path = T1_GetCharOutline(*f_ind, _str[i], size, transform);
+               char_path = T1_GetCharOutline(*f_ind, str[i], size, transform);
                str_path = T1_ConcatOutlines(str_path, char_path);
        }
        str_img = T1_AAFillOutline(str_path, 0);



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