--- ray/src/util/dctimestep.c	2019/08/14 18:20:02	2.41
+++ ray/src/util/dctimestep.c	2022/03/11 02:44:33	2.49
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: dctimestep.c,v 2.41 2019/08/14 18:20:02 greg Exp $";
+static const char RCSid[] = "$Id: dctimestep.c,v 2.49 2022/03/11 02:44:33 greg Exp $";
 #endif
 /*
  * Compute time-step result using Daylight Coefficient method.
@@ -48,7 +48,7 @@ sum_images(const char *fspec, const CMATRIX *cv, FILE 
 			error(SYSTEM, errmsg);
 		}
 		dt = DTfromHeader;
-		if ((err = cm_getheader(&dt, NULL, NULL, NULL, fp)) != NULL)
+		if ((err = cm_getheader(&dt, NULL, NULL, NULL, NULL, fp)) != NULL)
 			error(USER, err);
 		if ((dt != DTrgbe) & (dt != DTxyze) ||
 				!fscnresolu(&xr, &yr, fp)) {
@@ -64,7 +64,7 @@ sum_images(const char *fspec, const CMATRIX *cv, FILE 
 			pmat = cm_alloc(myYR, myXR);
 			memset(pmat->cmem, 0, sizeof(COLOR)*myXR*myYR);
 							/* finish header */
-			fputformat((char *)cm_fmt_id[myDT], fout);
+			fputformat(cm_fmt_id[myDT], fout);
 			fputc('\n', fout);
 			fflush(fout);
 		} else if ((dt != myDT) | (xr != myXR) | (yr != myYR)) {
@@ -107,6 +107,35 @@ sum_images(const char *fspec, const CMATRIX *cv, FILE 
 	return(i);
 }
 
+/* adjust matrix dimensions according to user size(s) */
+static int
+alt_dim(CMATRIX *cm, int nr, int nc)
+{
+	if ((nr <= 0) & (nc <= 0))
+		return(0);
+	if ((nr == cm->nrows) & (nc == cm->ncols))
+		return(0);
+	if (nr > 0) {
+		if (nc <= 0)
+			nc = cm->nrows*cm->ncols/nr;
+		if (nr*nc != cm->nrows*cm->ncols) {
+			fprintf(stderr, "Bad dimensions: %dx%d != %dx%d\n",
+					nr, nc, cm->nrows, cm->ncols);
+			return(-1);
+		}
+	} else /* nc > 0 */ {
+		nr = cm->nrows*cm->ncols/nc;
+		if (nc*nr != cm->nrows*cm->ncols) {
+			fprintf(stderr, "Bad dimensions: %d does not divide %dx%d evenly\n",
+					nc, cm->nrows, cm->ncols);
+			return(-1);
+		}
+	}
+	cm->nrows = nr;
+	cm->ncols = nc;
+	return(1);
+}
+
 /* check to see if a string contains a %d or %o specification */
 static int
 hasNumberFormat(const char *s)
@@ -141,6 +170,7 @@ main(int argc, char *argv[])
 	int		nsteps = 0;
 	char		*ofspec = NULL;
 	FILE		*ofp = stdout;
+	int		xres=0, yres=0;
 	CMATRIX		*cmtx;		/* component vector/matrix result */
 	char		fnbuf[256];
 	int		a, i;
@@ -187,10 +217,19 @@ main(int argc, char *argv[])
 			case 'a':
 				outfmt = DTascii;
 				break;
+			case 'c':
+				outfmt = DTrgbe;
+				break;
 			default:
 				goto userr;
 			}
 			break;
+		case 'x':
+			xres = atoi(argv[++a]);
+			break;
+		case 'y':
+			yres = atoi(argv[++a]);
+			break;
 		default:
 			goto userr;
 		}
@@ -237,6 +276,10 @@ main(int argc, char *argv[])
 		ofspec = NULL;			/* only need to open once */
 	}
 	if (hasNumberFormat(argv[a])) {		/* generating image(s) */
+		if (outfmt != DTrgbe) {
+			error(WARNING, "changing output type to -oc");
+			outfmt = DTrgbe;
+		}
 		if (ofspec == NULL) {
 			SET_FILE_BINARY(ofp);
 			newheader("RADIANCE", ofp);
@@ -282,6 +325,8 @@ main(int argc, char *argv[])
 			const char	*wtype = (outfmt==DTascii) ? "w" : "wb";
 			for (i = 0; i < nsteps; i++) {
 				CMATRIX	*rvec = cm_column(rmtx, i);
+				if (alt_dim(rvec, yres, xres) < 0)
+					return(1);
 				sprintf(fnbuf, ofspec, i);
 				if ((ofp = fopen(fnbuf, wtype)) == NULL) {
 					fprintf(stderr,
@@ -297,9 +342,14 @@ main(int argc, char *argv[])
 					printargs(argc, argv, ofp);
 					fputnow(ofp);
 					fprintf(ofp, "FRAME=%d\n", i);
-					fprintf(ofp, "NROWS=%d\n", rvec->nrows);
-					fputs("NCOLS=1\nNCOMP=3\n", ofp);
-					fputformat((char *)cm_fmt_id[outfmt], ofp);
+					if ((outfmt != DTrgbe) & (outfmt != DTxyze)) {
+						fprintf(ofp, "NROWS=%d\n", rvec->nrows);
+						fprintf(ofp, "NCOLS=%d\n", rvec->ncols);
+						fputs("NCOMP=3\n", ofp);
+					}
+					if ((outfmt == DTfloat) | (outfmt == DTdouble))
+						fputendian(ofp);
+					fputformat(cm_fmt_id[outfmt], ofp);
 					fputc('\n', ofp);
 				}
 				cm_write(rvec, outfmt, ofp);
@@ -318,14 +368,20 @@ main(int argc, char *argv[])
 #endif
 			if (outfmt != DTascii)
 				SET_FILE_BINARY(ofp);
+			if (alt_dim(rmtx, yres, xres) < 0)
+				return(1);
 			if (headout) {		/* header output */
 				newheader("RADIANCE", ofp);
 				printargs(argc, argv, ofp);
 				fputnow(ofp);
-				fprintf(ofp, "NROWS=%d\n", rmtx->nrows);
-				fprintf(ofp, "NCOLS=%d\n", rmtx->ncols);
-				fputs("NCOMP=3\n", ofp);
-				fputformat((char *)cm_fmt_id[outfmt], ofp);
+				if ((outfmt != DTrgbe) & (outfmt != DTxyze)) {
+					fprintf(ofp, "NROWS=%d\n", rmtx->nrows);
+					fprintf(ofp, "NCOLS=%d\n", rmtx->ncols);
+					fputs("NCOMP=3\n", ofp);
+				}
+				if ((outfmt == DTfloat) | (outfmt == DTdouble))
+					fputendian(ofp);
+				fputformat(cm_fmt_id[outfmt], ofp);
 				fputc('\n', ofp);
 			}
 			cm_write(rmtx, outfmt, ofp);
@@ -339,9 +395,9 @@ main(int argc, char *argv[])
 	cm_free(cmtx);
 	return(0);
 userr:
-	fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d}] DCspec [skyf]\n",
+	fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-x xr][-y yr][-i{f|d|h}][-o{f|d|c}] DCspec [skyf]\n",
 				progname);
-	fprintf(stderr, "   or: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d}] Vspec Tbsdf Dmat.dat [skyf]\n",
+	fprintf(stderr, "   or: %s [-n nsteps][-o ospec][-x xr][-y yr][-i{f|d|h}][-o{f|d|c}] Vspec Tbsdf Dmat.dat [skyf]\n",
 				progname);
 	return(1);
 }