--- ray/src/ot/oconv.c	1991/11/12 17:00:55	2.1
+++ ray/src/ot/oconv.c	1992/08/24 15:19:12	2.3
@@ -50,8 +50,7 @@ main(argc, argv)		/* convert object files to an octree
 int  argc;
 char  **argv;
 {
-	char  *getenv();
-	double  atof();
+	extern char  *getenv();
 	FVECT  bbmin, bbmax;
 	char  *infile = NULL;
 	int  outflags = IO_ALL;
@@ -212,7 +211,7 @@ OBJECT  obj;
 	CUBE  cukid;
 	OCTREE  ot;
 	OBJECT  oset[MAXSET+1];
-	unsigned char  inflg[MAXSET/8], volflg[MAXSET/8];
+	unsigned char  inflg[(MAXSET+7)/8], volflg[(MAXSET+7)/8];
 	int  in;
 	register int  i, j;
 
@@ -249,8 +248,7 @@ OBJECT  obj;
 	if (in==O_IN || oset[0] < objlim || cukid.cusize < mincusize) {
 						/* add to set */
 		if (oset[0] >= MAXSET) {
-			sprintf(errmsg,
-				"set overflow in addobject (%s)",
+			sprintf(errmsg, "set overflow in addobject (%s)",
 					objptr(obj)->oname);
 			error(INTERNAL, errmsg);
 		}
@@ -269,7 +267,7 @@ OBJECT  obj;
 		if (isvolume(objptr(oset[j])->otype)) {
 			setbit(volflg,j-1);
 			if ((*ofun[objptr(oset[j])->otype].funp)
-					(objptr(oset[j]),cu) == O_IN)
+					(objptr(oset[j]), cu) == O_IN)
 				setbit(inflg,j-1);
 		}
 					/* assign subcubes */
@@ -286,12 +284,12 @@ OBJECT  obj;
 				addobject(&cukid, oset[j]);
 					/* then this object */
 		addobject(&cukid, obj);
-					/* partial volumes */
+					/* then partial volumes */
 		for (j = 1; j <= oset[0]; j++)
 			if (tstbit(volflg,j-1) &&
 					!tstbit(inflg,j-1))
 				addobject(&cukid, oset[j]);
-					/* full volumes */
+					/* full volumes last */
 		for (j = 1; j <= oset[0]; j++)
 			if (tstbit(inflg,j-1))
 				addobject(&cukid, oset[j]);