--- ray/src/util/dctimestep.c	2016/03/06 01:13:18	2.37
+++ ray/src/util/dctimestep.c	2025/06/07 05:09:46	2.55
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: dctimestep.c,v 2.37 2016/03/06 01:13:18 schorsch Exp $";
+static const char RCSid[] = "$Id: dctimestep.c,v 2.55 2025/06/07 05:09:46 greg Exp $";
 #endif
 /*
  * Compute time-step result using Daylight Coefficient method.
@@ -14,39 +14,44 @@ static const char RCSid[] = "$Id: dctimestep.c,v 2.37 
 #include "platform.h"
 #include "resolu.h"
 
-char	*progname;			/* global argv[0] */
-
 /* Sum together a set of images and write result to fout */
 static int
 sum_images(const char *fspec, const CMATRIX *cv, FILE *fout)
 {
+	static int	runcnt = 0;
 	int	myDT = DTfromHeader;
-	COLOR	*scanline = NULL;
+	COLR	*scanline = NULL;
 	CMATRIX	*pmat = NULL;
 	int	myXR=0, myYR=0;
 	int	i, y;
 
 	if (cv->ncols != 1)
 		error(INTERNAL, "expected vector in sum_images()");
-	for (i = 0; i < cv->nrows; i++) {
-		const COLORV	*scv = cv_lval(cv,i);
+	for (i = cv->nrows; i-- > 0; ) {
+		const int	r = runcnt&1 ? i : cv->nrows-1 - i;
+		const COLORV	*scv = cv_lval(cv,r);
+		int		flat_file = 0;
 		char		fname[1024];
 		FILE		*fp;
+		long		data_start;
 		int		dt, xr, yr;
 		COLORV		*psp;
 		char		*err;
 							/* check for zero */
 		if ((scv[RED] == 0) & (scv[GRN] == 0) & (scv[BLU] == 0) &&
-				(myDT != DTfromHeader) | (i < cv->nrows-1))
+				(myDT != DTfromHeader) | (i > 0))
 			continue;
 							/* open next picture */
-		sprintf(fname, fspec, i);
+		sprintf(fname, fspec, r);
 		if ((fp = fopen(fname, "rb")) == NULL) {
 			sprintf(errmsg, "cannot open picture '%s'", fname);
 			error(SYSTEM, errmsg);
 		}
+#ifdef getc_unlocked
+		flockfile(fp);
+#endif
 		dt = DTfromHeader;
-		if ((err = cm_getheader(&dt, 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)) {
@@ -56,13 +61,13 @@ sum_images(const char *fspec, const CMATRIX *cv, FILE 
 		if (myDT == DTfromHeader) {		/* on first one */
 			myDT = dt;
 			myXR = xr; myYR = yr;
-			scanline = (COLOR *)malloc(sizeof(COLOR)*myXR);
+			scanline = (COLR *)malloc(sizeof(COLR)*myXR);
 			if (scanline == NULL)
 				error(SYSTEM, "out of memory in sum_images()");
 			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)) {
@@ -70,18 +75,31 @@ sum_images(const char *fspec, const CMATRIX *cv, FILE 
 					fname);
 			error(USER, errmsg);
 		}
+							/* flat file check */
+		if ((data_start = ftell(fp)) > 0 && fseek(fp, 0L, SEEK_END) == 0) {
+			flat_file = (ftell(fp) >= data_start + sizeof(COLR)*xr*yr);
+			if (fseek(fp, data_start, SEEK_SET) < 0) {
+				sprintf(errmsg, "cannot seek on picture '%s'", fname);
+				error(SYSTEM, errmsg);
+			}
+		}
 		psp = pmat->cmem;
 		for (y = 0; y < yr; y++) {		/* read it in */
+			COLOR	col;
 			int	x;
-			if (freadscan(scanline, xr, fp) < 0) {
+			if (flat_file ? getbinary(scanline, sizeof(COLR), xr, fp) != xr :
+					freadcolrs(scanline, xr, fp) < 0) {
 				sprintf(errmsg, "error reading picture '%s'",
 						fname);
 				error(SYSTEM, errmsg);
 			}
 							/* sum in scanline */
 			for (x = 0; x < xr; x++, psp += 3) {
-				multcolor(scanline[x], scv);
-				addcolor(psp, scanline[x]);
+				if (!scanline[x][EXP])
+					continue;	/* skip zeroes */
+				colr_color(col, scanline[x]);
+				multcolor(col, scv);
+				addcolor(psp, col);
 			}
 		}
 		fclose(fp);				/* done this picture */
@@ -89,9 +107,39 @@ sum_images(const char *fspec, const CMATRIX *cv, FILE 
 	free(scanline);
 	i = cm_write(pmat, myDT, fout);			/* write picture */
 	cm_free(pmat);					/* free data */
+	++runcnt;					/* for zig-zagging */
 	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)
@@ -126,11 +174,12 @@ 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;
-
-	progname = argv[0];
+					/* set global progname */
+	fixargv0(argv[0]);
 					/* get options */
 	for (a = 1; a < argc && argv[a][0] == '-'; a++)
 		switch (argv[a][1]) {
@@ -172,10 +221,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;
 		}
@@ -190,7 +248,7 @@ main(int argc, char *argv[])
 		nsteps = smtx->ncols;
 						/* load BSDF */
 		if (argv[a+1][0] != '!' &&
-				(ccp = strrchr(argv[a+1], '.')) != NULL &&
+				(ccp = strrchr(argv[a+1], '.')) > argv[a+1] &&
 				!strcasecmp(ccp+1, "XML"))
 			Tmat = cm_loadBTDF(argv[a+1]);
 		else
@@ -210,7 +268,7 @@ main(int argc, char *argv[])
 	}
 						/* prepare output stream */
 	if ((ofspec != NULL) & (nsteps == 1) && hasNumberFormat(ofspec)) {
-		sprintf(fnbuf, ofspec, 1);
+		sprintf(fnbuf, ofspec, 0);
 		ofspec = fnbuf;
 	}
 	if (ofspec != NULL && !hasNumberFormat(ofspec)) {
@@ -221,7 +279,11 @@ main(int argc, char *argv[])
 		}
 		ofspec = NULL;			/* only need to open once */
 	}
-	if (hasNumberFormat(argv[a])) {		/* generating image(s) */
+	if (hasNumberFormat(argv[a])) {		/* loading image vector(s) */
+		if (outfmt != DTrgbe) {
+			error(WARNING, "changing output type to -oc");
+			outfmt = DTrgbe;
+		}
 		if (ofspec == NULL) {
 			SET_FILE_BINARY(ofp);
 			newheader("RADIANCE", ofp);
@@ -232,7 +294,7 @@ main(int argc, char *argv[])
 			for (i = 0; i < nsteps; i++) {
 				CMATRIX	*cvec = cm_column(cmtx, i);
 				if (ofspec != NULL) {
-					sprintf(fnbuf, ofspec, i+1);
+					sprintf(fnbuf, ofspec, i);
 					if ((ofp = fopen(fnbuf, "wb")) == NULL) {
 						fprintf(stderr,
 					"%s: cannot open '%s' for output\n",
@@ -243,7 +305,7 @@ main(int argc, char *argv[])
 					printargs(argc, argv, ofp);
 					fputnow(ofp);
 				}
-				fprintf(ofp, "FRAME=%d\n", i+1);
+				fprintf(ofp, "FRAME=%d\n", i);
 				if (!sum_images(argv[a], cvec, ofp))
 					return(1);
 				if (ofspec != NULL) {
@@ -259,7 +321,7 @@ main(int argc, char *argv[])
 			}
 		else if (!sum_images(argv[a], cmtx, ofp))
 			return(1);
-	} else {				/* generating vector/matrix */
+	} else {				/* loading view matrix */
 		CMATRIX	*Vmat = cm_load(argv[a], 0, cmtx->nrows, DTfromHeader);
 		CMATRIX	*rmtx = cm_multiply(Vmat, cmtx);
 		cm_free(Vmat);
@@ -267,7 +329,9 @@ main(int argc, char *argv[])
 			const char	*wtype = (outfmt==DTascii) ? "w" : "wb";
 			for (i = 0; i < nsteps; i++) {
 				CMATRIX	*rvec = cm_column(rmtx, i);
-				sprintf(fnbuf, ofspec, i+1);
+				if (alt_dim(rvec, yres, xres) < 0)
+					return(1);
+				sprintf(fnbuf, ofspec, i);
 				if ((ofp = fopen(fnbuf, wtype)) == NULL) {
 					fprintf(stderr,
 					"%s: cannot open '%s' for output\n",
@@ -281,10 +345,15 @@ main(int argc, char *argv[])
 					newheader("RADIANCE", ofp);
 					printargs(argc, argv, ofp);
 					fputnow(ofp);
-					fprintf(ofp, "FRAME=%d\n", i+1);
-					fprintf(ofp, "NROWS=%d\n", rvec->nrows);
-					fputs("NCOLS=1\nNCOMP=3\n", ofp);
-					fputformat((char *)cm_fmt_id[outfmt], ofp);
+					fprintf(ofp, "FRAME=%d\n", i);
+					if ((outfmt != DTrgbe) & (outfmt != DTxyze)) {
+						fprintf(ofp, "NROWS=%d\n", rvec->nrows);
+						fprintf(ofp, "NCOLS=%d\n", rvec->ncols);
+						fputncomp(3, ofp);
+					}
+					if ((outfmt == DTfloat) | (outfmt == DTdouble))
+						fputendian(ofp);
+					fputformat(cm_fmt_id[outfmt], ofp);
 					fputc('\n', ofp);
 				}
 				cm_write(rvec, outfmt, ofp);
@@ -303,14 +372,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);
+					fputncomp(3, ofp);
+				}
+				if ((outfmt == DTfloat) | (outfmt == DTdouble))
+					fputendian(ofp);
+				fputformat(cm_fmt_id[outfmt], ofp);
 				fputc('\n', ofp);
 			}
 			cm_write(rmtx, outfmt, ofp);
@@ -324,9 +399,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);
 }