--- ray/src/hd/rhdobj.c 2003/06/26 00:58:10 3.13 +++ ray/src/hd/rhdobj.c 2003/06/30 14:59:11 3.14 @@ -1,10 +1,12 @@ #ifndef lint -static const char RCSid[] = "$Id: rhdobj.c,v 3.13 2003/06/26 00:58:10 schorsch Exp $"; +static const char RCSid[] = "$Id: rhdobj.c,v 3.14 2003/06/30 14:59:11 schorsch Exp $"; #endif /* * Routines for loading and displaying Radiance objects in rholo with GLX. */ +#include + #include "radogl.h" #include "tonemap.h" #include "rhdisp.h" @@ -338,7 +340,7 @@ ssph_compute() /* compute source set from sphere sam d = 1.0/ncells; scalecolor(dlightsets->lamb, d); done: /* clear sphere sample array */ - bzero((void *)ssamp, sizeof(ssamp)); + memset((void *)ssamp, '\0', sizeof(ssamp)); return(ncells); } @@ -731,13 +733,13 @@ dobj_unmove() /* undo last transform change */ return(0); } /* hold last transform */ - bcopy((void *)lastxfav, (void *)txfav, + memcpy((void *)txfav, (void *)lastxfav, (txfac=lastxfac)*sizeof(char *)); /* save this transform */ - bcopy((void *)curobj->xfav, (void *)lastxfav, + memcpy((void *)lastxfav, (void *)curobj->xfav, (lastxfac=curobj->xfac)*sizeof(char *)); /* copy back last transform */ - bcopy((void *)txfav, (void *)curobj->xfav, + memcpy((void *)curobj->xfav, (void *)txfav, (curobj->xfac=txfac)*sizeof(char *)); /* set matrices */ fullxf(&curobj->xfb, curobj->xfac, curobj->xfav);