--- ray/src/util/rad.c	2005/09/12 14:40:13	2.81
+++ ray/src/util/rad.c	2008/03/11 12:42:07	2.84
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rad.c,v 2.81 2005/09/12 14:40:13 schorsch Exp $";
+static const char	RCSid[] = "$Id: rad.c,v 2.84 2008/03/11 12:42:07 greg Exp $";
 #endif
 /*
  * Executive program for oconv, rpict and pfilt
@@ -1012,9 +1012,19 @@ specview(				/* get proper view spec from vs */
 	} else if (*vs == 'z') {
 		zpos = -1; vs++;
 	}
-	viewtype = 'v';
-	if((*vs == 'v') | (*vs == 'l') | (*vs == 'a') | (*vs == 'h') | (*vs == 'c'))
+	switch (*vs) {
+	case VT_PER:
+	case VT_PAR:
+	case VT_ANG:
+	case VT_HEM:
+	case VT_PLS:
+	case VT_CYL:
 		viewtype = *vs++;
+		break;
+	default:
+		viewtype = VT_PER;
+		break;
+	}
 	cp = viewopts;
 	if ((!*vs || isspace(*vs)) && (xpos|ypos|zpos)) {	/* got one! */
 		*cp++ = '-'; *cp++ = 'v'; *cp++ = 't'; *cp++ = viewtype;
@@ -1056,19 +1066,20 @@ specview(				/* get proper view spec from vs */
 		}
 		cp = addarg(cp, vup[upax+3]);
 		switch (viewtype) {
-		case 'v':
+		case VT_PER:
 			cp = addarg(cp, "-vh 45 -vv 45");
 			break;
-		case 'l':
+		case VT_PAR:
 			d = sqrt(dim[0]*dim[0]+dim[1]*dim[1]+dim[2]*dim[2]);
 			sprintf(cp, " -vh %.2g -vv %.2g", d, d);
 			cp += strlen(cp);
 			break;
-		case 'a':
-		case 'h':
+		case VT_ANG:
+		case VT_HEM:
+		case VT_PLS:
 			cp = addarg(cp, "-vh 180 -vv 180");
 			break;
-		case 'c':
+		case VT_CYL:
 			cp = addarg(cp, "-vh 180 -vv 90");
 			break;
 		}
@@ -1320,14 +1331,12 @@ rpict(				/* run rpict and pfilt for each view */
 					zopt, oct1name, rawfile);
 			if (pfile != NULL && inchild()) {
 						/* rpict persistent mode */
-				if (!silent) {
+				if (!silent)
 					printf("\t%s\n", combuf);
-					fflush(stdout);
-				}
+				fflush(stdout);
 				sprintf(combuf, "rpict%s %s %s%s%s %s > %s",
 						rep, rppopt, res, po, opts,
 						oct1name, rawfile);
-				fflush(stdout);
 				fp = popen(combuf, "w");
 				if (fp == NULL)
 					goto rperror;
@@ -1408,7 +1417,7 @@ runcom(			/* run command */
 		printf("\t%s\n", cs);
 	if (!nprocs)
 		return(0);
-	fflush(stdout);		/* flush output and pass to shell */
+	fflush(NULL);		/* flush output and pass to shell */
 	return(system(cs));
 }
 
@@ -1455,7 +1464,7 @@ next_process(void)			/* fork the next process (max. np
 	}
 	if (children_running >= nprocs)
 		wait_process(0);	/* wait for someone to finish */
-	fflush(stdout);
+	fflush(NULL);			/* flush output */
 	child_pid = fork();		/* split process */
 	if (child_pid == 0) {		/* we're the child */
 		children_running = -1;