--- ray/src/common/readoct.c	1992/07/13 15:36:29	2.4
+++ ray/src/common/readoct.c	1992/09/21 12:04:17	2.7
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -41,7 +41,7 @@ char  *ofn[];
 	extern int  fputs();
 	char  sbuf[512];
 	int  nf;
-	OBJECT  fnobjects;
+	OBJECT	fnobjects;
 	register int  i;
 	long  m;
 	
@@ -56,6 +56,9 @@ char  *ofn[];
 			error(SYSTEM, errmsg);
 		}
 	}
+#ifdef MSDOS
+	setmode(fileno(infp), O_BINARY);
+#endif
 					/* get header */
 	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : NULL) < 0)
 		octerror(USER, "not an octree");
@@ -88,28 +91,28 @@ char  *ofn[];
 	if (fnobjects != m)
 		octerror(USER, "too many objects");
 
-	if (load & IO_TREE) {
-						/* get the octree */
+	if (load & IO_TREE)			/* get the octree */
 		scene->cutree = gettree();
-		if (load & IO_SCENE)		/* get the scene */
-		    if (nf == 0) {
-			for (i = 0; *ogetstr(sbuf); i++)
-				if ((otypmap[i] = otype(sbuf)) < 0) {
-					sprintf(errmsg, "unknown type \"%s\"",
-							sbuf);
-					octerror(WARNING, errmsg);
-				}
-			while (getobj() != OVOID)
-				;
-		    } else {			/* consistency checks */
-					/* check object count */
-			if (nobjects != objorig+fnobjects)
-				octerror(USER, "bad object count; octree stale?");
-					/* check for non-surfaces */
-			if (nonsurfinset(objorig, fnobjects))
-				octerror(USER, "modifier in tree; octree stale?");
-		    }
-	}
+	else if (load & IO_SCENE && nf == 0)
+		skiptree();
+		
+	if (load & IO_SCENE)		/* get the scene */
+	    if (nf == 0) {
+		for (i = 0; *ogetstr(sbuf); i++)
+			if ((otypmap[i] = otype(sbuf)) < 0) {
+				sprintf(errmsg, "unknown type \"%s\"", sbuf);
+				octerror(WARNING, errmsg);
+			}
+		while (getobj() != OVOID)
+			;
+	    } else {			/* consistency checks */
+				/* check object count */
+		if (nobjects != objorig+fnobjects)
+			octerror(USER, "bad object count; octree stale?");
+				/* check for non-surfaces */
+		if (nonsurfinset(objorig, fnobjects))
+			octerror(USER, "modifier in tree; octree stale?");
+	    }
 	fclose(infp);
 	return(nf);
 }
@@ -130,7 +133,7 @@ char  *s;
 static OCTREE
 getfullnode()			/* get a set, return fullnode */
 {
-	OBJECT  set[MAXSET+1];
+	OBJECT	set[MAXSET+1];
 	register int  i;
 	register long  m;
 
@@ -163,7 +166,7 @@ static double
 ogetflt()			/* get a floating point number */
 {
 	extern double  getflt();
-	double  r;
+	double	r;
 
 	r = getflt(infp);
 	if (feof(infp))
@@ -175,7 +178,7 @@ ogetflt()			/* get a floating point number */
 static OCTREE
 gettree()			/* get a pre-ordered octree */
 {
-	register OCTREE  ot;
+	register OCTREE	 ot;
 	register int  i;
 	
 	switch (getc(infp)) {
@@ -198,13 +201,38 @@ gettree()			/* get a pre-ordered octree */
 
 
 static
+skiptree()				/* skip octree on input */
+{
+	register int  i;
+	
+	switch (getc(infp)) {
+	case OT_EMPTY:
+		return;
+	case OT_FULL:
+		for (i = ogetint(objsize)*objsize; i-- > 0; )
+			if (getc(infp) == EOF)
+				octerror(USER, "truncated octree");
+		return;
+	case OT_TREE:
+		for (i = 0; i < 8; i++)
+			skiptree();
+		return;
+	case EOF:
+		octerror(USER, "truncated octree");
+	default:
+		octerror(USER, "damaged octree");
+	}
+}
+
+
+static
 getobj()				/* get next object */
 {
 	char  sbuf[MAXSTR];
 	int  obj;
 	register int  i;
 	register long  m;
-	register OBJREC  *objp;
+	register OBJREC	 *objp;
 
 	i = ogetint(1);
 	if (i == -1)
@@ -230,7 +258,7 @@ getobj()				/* get next object */
 			objp->oargs.sarg[i] = savestr(ogetstr(sbuf));
 	} else
 		objp->oargs.sarg = NULL;
-#ifdef  IARGS
+#ifdef	IARGS
 	if (objp->oargs.niargs = ogetint(2)) {
 		objp->oargs.iarg = (long *)bmalloc
 				(objp->oargs.niargs*sizeof(long));