CVS update: php3/functions

Date: Friday May 28, 1999 @ 5:40 Author: jah Update of /repository/php3/functions In directory php:/tmp/cvs-serv6135/functions Modified Files: gd.c Log Message: Small fixes. Index: php3/functions/gd.c diff -u php3/functions/gd.c:1.114 php3/functions/gd.c:1.115 --- php3/functions/gd.c:1.114 Fri May 28 05:33:23 1999 +++ php3/functions/gd.c Fri May 28 05:40:06 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.114 1999/05/28 09:33:23 steinm Exp $ */ +/* $Id: gd.c,v 1.115 1999/05/28 09:40:06 jah Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -2092,7 +2092,7 @@ width = wd->value.lval; convert_to_double(ang); angle = ang->value.dval; - make_path = 1; + make_path = width || angle ? 1 : 0; break; default: WRONG_PARAM_COUNT; @@ -2214,6 +2214,7 @@ pval *str, *fnt, *sz, *sp, *wd, *ang; int i, space, width, amount_kern, type, *f_ind; int per_char = 0; + double angle; BBox char_bbox, str_bbox; switch(ARG_COUNT(ht)) { @@ -2238,7 +2239,8 @@ convert_to_long(wd); width = wd->value.lval; convert_to_double(ang); - per_char = 1; + angle = ang->value.dval; + per_char = width || angle ? 1 : 0; break; default: WRONG_PARAM_COUNT; @@ -2269,13 +2271,16 @@ char_bbox = T1_GetCharBBox(*f_ind, str->value.str.val[i]); } str_bbox.urx += width; + /* + str_bbox.urx += char_bbox.urx + char_bbox.llx; + */ str_bbox.urx += char_bbox.urx + char_bbox.llx; str_bbox.lly = (char_bbox.lly < str_bbox.lly ? char_bbox.lly : str_bbox.lly); str_bbox.ury = (char_bbox.ury > str_bbox.ury ? char_bbox.ury : str_bbox.ury); - /* + printf("%d %d %d %d : %d %d %d %d\n", char_bbox.llx, char_bbox.lly, char_bbox.urx, char_bbox.ury, str_bbox.llx, str_bbox.lly, str_bbox.urx, str_bbox.ury); - */ + } } else { str_bbox = T1_GetStringBBox(*f_ind, str->value.str.val, str->value.str.len, space, T1_KERNING); -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net