--- ray/src/util/rpiece.c	2012/06/01 22:55:14	2.54
+++ ray/src/util/rpiece.c	2023/07/11 02:22:30	2.60
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rpiece.c,v 2.54 2012/06/01 22:55:14 greg Exp $";
+static const char	RCSid[] = "$Id: rpiece.c,v 2.60 2023/07/11 02:22:30 greg Exp $";
 #endif
 /*
  * Generate sections of a picture.
@@ -37,7 +37,11 @@ main(
 #ifndef NFS
 #define  NFS			1
 #endif
-				/* set the following to 0 to forgo forking */
+
+#ifndef RHAS_FORK_EXEC
+#undef MAXFORK
+#define MAXFORK			0
+#endif
 #ifndef MAXFORK
 #if NFS
 #define  MAXFORK		3	/* allotment of duped processes */
@@ -101,7 +105,7 @@ main(
 	char  *argv[]
 )
 {
-	register int  i, rval;
+	int  i, rval;
 	
 	progname = argv[0];
 	for (i = 1; i < argc; i++) {
@@ -275,7 +279,7 @@ init(			/* set up output file and start rpict */
 	normaspect(viewaspect(&ourview)*hmult/vmult, &pixaspect, &hres, &vres);
 	if (!nowarn && (hr != hres*hmult) | (vr != vres*vmult))
 		fprintf(stderr,
-		"%s: warning - resolution changed from %dx%d to %dx%d\n",
+		"%s: warning - changed resolution from %dx%d to %dx%d\n",
 				progname, hr, vr, hres*hmult, vres*vmult);
 	sprintf(hrbuf, "%d", hres);
 	rpargv[rpargc++] = "-x"; rpargv[rpargc++] = hrbuf;
@@ -294,12 +298,13 @@ init(			/* set up output file and start rpict */
 		fprintf(fp, "SOFTWARE= %s\n", VersionID);
 		fputs(VIEWSTR, fp);
 		fprintview(&ourview, fp);
-		putc('\n', fp);
+		fputc('\n', fp);
 		fputnow(fp);
 		if (pixaspect < .99 || pixaspect > 1.01)
 			fputaspect(pixaspect, fp);
+		fputprims(stdprims, fp);
 		fputformat(COLRFMT, fp);
-		putc('\n', fp);
+		fputc('\n', fp);
 		fprtresolu(hres*hmult, vres*vmult, fp);
 	} else if ((outfd = open(outfile, O_RDWR)) >= 0) {
 		dolock(outfd, F_RDLCK);
@@ -322,6 +327,7 @@ init(			/* set up output file and start rpict */
 		goto filerr;
 	dolock(outfd, F_UNLCK);
 					/* start rpict process */
+	rpd = sp_inactive;
 	if (open_process(&rpd, rpargv) <= 0) {
 		fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]);
 		exit(1);
@@ -392,13 +398,13 @@ nextpiece(		/* get next piece assignment */
 
 static int
 rvrpiece(		/* check for recoverable pieces */
-	register int	*xp,
-	register int	*yp
+	int	*xp,
+	int	*yp
 )
 {
 	static char  *pdone = NULL;	/* which pieces are done */
 	static long  readpos = -1;	/* how far we've read */
-	register int  i;
+	int  px, py, i;
 	/*
 	 * This routine is called by nextpiece() with an
 	 * exclusive lock on syncfp and the file pointer at the
@@ -407,15 +413,15 @@ rvrpiece(		/* check for recoverable pieces */
 	if (rvrlim < 0)
 		return(0);		/* only check if asked */
 	if (pdone == NULL)		/* first call */
-		pdone = calloc(hmult*vmult, sizeof(char));
+		pdone = (char *)calloc(hmult*vmult, sizeof(char));
 	if (pdone == NULL) {
 		fprintf(stderr, "%s: out of memory\n", progname);
 		exit(1);
 	}
 	if (readpos != -1)		/* mark what's been done */
 		fseek(syncfp, readpos, 0);
-	while (fscanf(syncfp, "%d %d", xp, yp) == 2)
-		pdone[*xp*vmult+*yp] = 1;
+	while (fscanf(syncfp, "%d %d", &px, &py) == 2)
+		pdone[px*vmult+py] = 1;
 	if (!feof(syncfp)) {
 		fprintf(stderr, "%s: format error in sync file\n", progname);
 		exit(1);
@@ -456,57 +462,21 @@ cleanup(			/* close rpict process and clean up */
 static void
 rpiece(void)			/* render picture piece by piece */
 {
+	char  *err;
 	VIEW  pview;
 	int  xorg, yorg;
-					/* compute view parameters */
-	pview = ourview;
-	switch (ourview.type) {
-	case VT_PER:
-		pview.horiz = (2.*180./PI)*atan(
-				tan((PI/180./2.)*ourview.horiz)/hmult );
-		pview.vert = (2.*180./PI)*atan(
-				tan((PI/180./2.)*ourview.vert)/vmult );
-		break;
-	case VT_PAR:
-	case VT_ANG:
-		pview.horiz = ourview.horiz / hmult;
-		pview.vert = ourview.vert / vmult;
-		break;
-	case VT_CYL:
-		pview.horiz = ourview.horiz / hmult;
-		pview.vert = (2.*180./PI)*atan(
-				tan((PI/180./2.)*ourview.vert)/vmult );
-		break;
-	case VT_HEM:
-		pview.horiz = (2.*180./PI)*asin(
-				sin((PI/180./2.)*ourview.horiz)/hmult );
-		pview.vert = (2.*180./PI)*asin(
-				sin((PI/180./2.)*ourview.vert)/vmult );
-		break;
-	case VT_PLS:
-		pview.horiz = sin((PI/180./2.)*ourview.horiz) /
-				(1.0 + cos((PI/180./2.)*ourview.horiz)) / hmult;
-		pview.horiz *= pview.horiz;
-		pview.horiz = (2.*180./PI)*acos((1. - pview.horiz) /
-						(1. + pview.horiz));
-		pview.vert = sin((PI/180./2.)*ourview.vert) /
-				(1.0 + cos((PI/180./2.)*ourview.vert)) / vmult;
-		pview.vert *= pview.vert;
-		pview.vert = (2.*180./PI)*acos((1. - pview.vert) /
-						(1. + pview.vert));
-		break;
-	default:
-		fprintf(stderr, "%s: unknown view type '-vt%c'\n",
-				progname, ourview.type);
-		exit(cleanup(1));
-	}
 					/* render each piece */
 	while (nextpiece(&xorg, &yorg)) {
-		pview.hoff = ourview.hoff*hmult + xorg - 0.5*(hmult-1);
-		pview.voff = ourview.voff*vmult + yorg - 0.5*(vmult-1);
+		pview = ourview;
+		err = cropview(&pview, (double)xorg/hmult, (double)yorg/vmult,
+					(xorg+1.)/hmult, (yorg+1.)/vmult);
+		if (err != NULL) {
+			fprintf(stderr, "%s: %s\n", progname, err);
+			exit(cleanup(1));
+		}
 		fputs(VIEWSTR, torp);
 		fprintview(&pview, torp);
-		putc('\n', torp);
+		fputc('\n', torp);
 		fflush(torp);			/* assigns piece to rpict */
 		putpiece(xorg, yorg);		/* place piece in output */
 	}
@@ -522,7 +492,7 @@ int	ypos
 	struct flock  fls;
 	int  pid, status;
 	int  hr, vr;
-	register int  y;
+	int  y;
 				/* check bounds */
 	if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) {
 		fprintf(stderr, "%s: requested piece (%d,%d) out of range\n",