--- ray/src/hd/rhd_qtree.c 2003/02/22 02:07:24 3.19 +++ ray/src/hd/rhd_qtree.c 2003/04/23 00:52:33 3.21 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rhd_qtree.c,v 3.19 2003/02/22 02:07:24 greg Exp $"; +static const char RCSid[] = "$Id: rhd_qtree.c,v 3.21 2003/04/23 00:52:33 greg Exp $"; #endif /* * Quadtree driver support routines. @@ -53,7 +53,7 @@ newtwig() /* allocate a twig */ } bi = nexttwig / TBUNDLESIZ; if (twigbundle[bi] == NULL) { /* new block */ - twigbundle = (RTREE **)realloc((char *)twigbundle, + twigbundle = (RTREE **)realloc((void *)twigbundle, (bi+2)*sizeof(RTREE *)); if (twigbundle == NULL) goto memerr; @@ -355,10 +355,11 @@ FVECT d, p; else VCOPY(qtL.wp[li], p); qtL.wd[li] = encodedir(d); - tmCvColrs(&qtL.brt[li], qtL.chr[li], c, 1); + tmCvColrs(&qtL.brt[li], qtL.chr[li], (COLR *)c, 1); if (putleaf(li, 1)) { if (mapit) - tmMapPixels(qtL.rgb+li, qtL.brt+li, qtL.chr+li, 1); + tmMapPixels((BYTE *)(qtL.rgb+li), qtL.brt+li, + (BYTE *)(qtL.chr+li), 1); if (--rayqleft == 0) dev_flush(); /* flush output */ } @@ -409,12 +410,12 @@ int redo; if (tmComputeMapping(0., 0., 0.) != TM_E_OK) return(0); } - if (tmMapPixels(qtL.rgb+aorg, qtL.brt+aorg, - qtL.chr+aorg, alen) != TM_E_OK) + if (tmMapPixels((BYTE *)(qtL.rgb+aorg), qtL.brt+aorg, + (BYTE *)(qtL.chr+aorg), alen) != TM_E_OK) return(0); if (blen > 0) - tmMapPixels(qtL.rgb+borg, qtL.brt+borg, - qtL.chr+borg, blen); + tmMapPixels((BYTE *)(qtL.rgb+borg), qtL.brt+borg, + (BYTE *)(qtL.chr+borg), blen); qtL.tml = qtL.tl; return(1); }