cvs: php4 /ext/gd gd.c gd_ctx.c

sniper Sat Mar 31 22:20:45 2001 EDT Modified files: /php4/ext/gd gd.c gd_ctx.c Log: According to GD documentation the macros should be used instead.. Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.119 php4/ext/gd/gd.c:1.120 --- php4/ext/gd/gd.c:1.119 Sat Mar 31 21:42:07 2001 +++ php4/ext/gd/gd.c Sat Mar 31 22:20:45 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.119 2001/04/01 05:42:07 sniper Exp $ */ +/* $Id: gd.c,v 1.120 2001/04/01 06:20:45 sniper Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -855,8 +855,8 @@ (*func_p)(im, fp, q); break; case PHP_GDIMG_TYPE_WBM: - for(i=0; i < im->colorsTotal; i++) { - if(im->red[i] == 0) break; + for(i=0; i < gdImageColorsTotal(im); i++) { + if(gdImageRed(im, i) == 0) break; } (*func_p)(im, i, fp); break; @@ -886,8 +886,8 @@ (*func_p)(im, tmp, q); break; case PHP_GDIMG_TYPE_WBM: - for(i=0; i < im->colorsTotal; i++) { - if(im->red[i] == 0) break; + for(i=0; i < gdImageColorsTotal(im); i++) { + if(gdImageRed(im, i) == 0) break; } (*func_p)(im, q, tmp); break; Index: php4/ext/gd/gd_ctx.c diff -u php4/ext/gd/gd_ctx.c:1.3 php4/ext/gd/gd_ctx.c:1.4 --- php4/ext/gd/gd_ctx.c:1.3 Sat Mar 31 21:42:07 2001 +++ php4/ext/gd/gd_ctx.c Sat Mar 31 22:20:45 2001 @@ -82,8 +82,8 @@ (*func_p)(im, ctx, q); break; case PHP_GDIMG_TYPE_WBM: - for(i=0; i < im->colorsTotal; i++) { - if(im->red[i] == 0) break; + for(i=0; i < gdImageColorsTotal(im); i++) { + if(gdImageRed(im, i) == 0) break; } (*func_p)(im, i, ctx); break;