--- ray/src/hd/rhdisp3.c 1998/07/07 11:07:42 3.10 +++ ray/src/hd/rhdisp3.c 2003/04/23 00:52:33 3.13 @@ -1,9 +1,6 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: rhdisp3.c,v 3.13 2003/04/23 00:52:33 greg Exp $"; #endif - /* * Holodeck beam support for display process */ @@ -30,6 +27,9 @@ int bi; FVECT cp[4], ip[4], pf, pb; double af, ab, sf2, sb2, dfb2, df2, db2, penalty; register int i; + /* special case */ + if (hr <= 0 | vr <= 0) + return(0); /* compute cell corners in image */ if (!hdbcoord(gc, hp, bi)) error(CONSISTENCY, "bad beam index in npixels"); @@ -281,9 +281,9 @@ VIEW *vp; if (cl.cl == NULL) goto memerr; cl.n = 0; /* add cells within pyramid */ - visit_cells(org, dir, hp, addcell, &cl); + visit_cells(org, dir, hp, addcell, (char *)&cl); if (!cl.n) { - free((char *)cl.cl); + free((void *)cl.cl); return(NULL); } *np = cl.n * orient; @@ -292,7 +292,7 @@ VIEW *vp; * sorted automatically by visit_cells(), so we don't need this. */ /* optimize memory use */ - cl.cl = (GCOORD *)realloc((char *)cl.cl, cl.n*sizeof(GCOORD)); + cl.cl = (GCOORD *)realloc((void *)cl.cl, cl.n*sizeof(GCOORD)); if (cl.cl == NULL) goto memerr; /* sort the list */