--- ray/src/util/dctimestep.c	2014/01/20 21:29:04	2.28
+++ ray/src/util/dctimestep.c	2019/08/14 18:20:02	2.41
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: dctimestep.c,v 2.28 2014/01/20 21:29:04 greg Exp $";
+static const char RCSid[] = "$Id: dctimestep.c,v 2.41 2019/08/14 18:20:02 greg Exp $";
 #endif
 /*
  * Compute time-step result using Daylight Coefficient method.
@@ -8,6 +8,7 @@ static const char RCSid[] = "$Id: dctimestep.c,v 2.28 
  */
 
 #include <ctype.h>
+#include "platform.h"
 #include "standard.h"
 #include "cmatrix.h"
 #include "platform.h"
@@ -20,7 +21,7 @@ static int
 sum_images(const char *fspec, const CMATRIX *cv, FILE *fout)
 {
 	int	myDT = DTfromHeader;
-	COLOR	*scanline = NULL;
+	COLR	*scanline = NULL;
 	CMATRIX	*pmat = NULL;
 	int	myXR=0, myYR=0;
 	int	i, y;
@@ -29,22 +30,26 @@ sum_images(const char *fspec, const CMATRIX *cv, FILE 
 		error(INTERNAL, "expected vector in sum_images()");
 	for (i = 0; i < cv->nrows; i++) {
 		const COLORV	*scv = cv_lval(cv,i);
+		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))
 			continue;
 							/* open next picture */
 		sprintf(fname, fspec, i);
-		if ((fp = fopen(fname, "r")) == NULL) {
+		if ((fp = fopen(fname, "rb")) == NULL) {
 			sprintf(errmsg, "cannot open picture '%s'", fname);
 			error(SYSTEM, errmsg);
 		}
-		SET_FILE_BINARY(fp);
-		dt = getDTfromHeader(fp);
+		dt = DTfromHeader;
+		if ((err = cm_getheader(&dt, NULL, NULL, NULL, fp)) != NULL)
+			error(USER, err);
 		if ((dt != DTrgbe) & (dt != DTxyze) ||
 				!fscnresolu(&xr, &yr, fp)) {
 			sprintf(errmsg, "file '%s' not a picture", fname);
@@ -53,44 +58,53 @@ 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(myDT==DTrgbe ? COLRFMT : CIEFMT, fout);
+			fputformat((char *)cm_fmt_id[myDT], fout);
 			fputc('\n', fout);
-			fprtresolu(myXR, myYR, fout);
 			fflush(fout);
 		} else if ((dt != myDT) | (xr != myXR) | (yr != myYR)) {
 			sprintf(errmsg, "picture '%s' format/size mismatch",
 					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 */
 	}
 	free(scanline);
-							/* write scanlines */
-	for (y = 0; y < myYR; y++)
-		if (fwritescan((COLOR *)cm_lval(pmat, y, 0), myXR, fout) < 0)
-			return(0);
-	cm_free(pmat);					/* all done */
-	return(fflush(fout) == 0);
+	i = cm_write(pmat, myDT, fout);			/* write picture */
+	cm_free(pmat);					/* free data */
+	return(i);
 }
 
 /* check to see if a string contains a %d or %o specification */
@@ -121,8 +135,10 @@ hasNumberFormat(const char *s)
 int
 main(int argc, char *argv[])
 {
-	int		skyfmt = DTascii;
-	int		nsteps = 1;
+	int		skyfmt = DTfromHeader;
+	int		outfmt = DTascii;
+	int		headout = 1;
+	int		nsteps = 0;
 	char		*ofspec = NULL;
 	FILE		*ofp = stdout;
 	CMATRIX		*cmtx;		/* component vector/matrix result */
@@ -135,11 +151,12 @@ main(int argc, char *argv[])
 		switch (argv[a][1]) {
 		case 'n':
 			nsteps = atoi(argv[++a]);
-			if (nsteps <= 0)
+			if (nsteps < 0)
 				goto userr;
+			skyfmt = nsteps ? DTascii : DTfromHeader;
 			break;
-		case 'o':
-			ofspec = argv[++a];
+		case 'h':
+			headout = !headout;
 			break;
 		case 'i':
 			switch (argv[a][2]) {
@@ -156,6 +173,24 @@ main(int argc, char *argv[])
 				goto userr;
 			}
 			break;
+		case 'o':
+			switch (argv[a][2]) {
+			case '\0':	/* output specification (not format) */
+				ofspec = argv[++a];
+				break;
+			case 'f':
+				outfmt = DTfloat;
+				break;
+			case 'd':
+				outfmt = DTdouble;
+				break;
+			case 'a':
+				outfmt = DTascii;
+				break;
+			default:
+				goto userr;
+			}
+			break;
 		default:
 			goto userr;
 		}
@@ -163,27 +198,30 @@ main(int argc, char *argv[])
 		goto userr;
 
 	if (argc-a > 2) {			/* VTDs expression */
-		CMATRIX	*smtx, *Dmat, *Tmat, *imtx;
-		COLOR	tLamb;
+		CMATRIX		*smtx, *Dmat, *Tmat, *imtx;
+		const char	*ccp;
 						/* get sky vector/matrix */
 		smtx = cm_load(argv[a+3], 0, nsteps, skyfmt);
+		nsteps = smtx->ncols;
 						/* load BSDF */
-		Tmat = cm_loadBSDF(argv[a+1], tLamb);
+		if (argv[a+1][0] != '!' &&
+				(ccp = strrchr(argv[a+1], '.')) != NULL &&
+				!strcasecmp(ccp+1, "XML"))
+			Tmat = cm_loadBTDF(argv[a+1]);
+		else
+			Tmat = cm_load(argv[a+1], 0, 0, DTfromHeader);
 						/* load Daylight matrix */
-		Dmat = cm_load(argv[a+2], Tmat==NULL ? 0 : Tmat->ncols,
+		Dmat = cm_load(argv[a+2], Tmat->ncols,
 					smtx->nrows, DTfromHeader);
 						/* multiply vector through */
 		imtx = cm_multiply(Dmat, smtx);
 		cm_free(Dmat); cm_free(smtx);
-		if (Tmat == NULL) {		/* diffuse only */
-			cmtx = cm_scale(imtx, tLamb);
-		} else {			/* else apply BTDF matrix */
-			cmtx = cm_multiply(Tmat, imtx);
-			cm_free(Tmat); 
-		}
+		cmtx = cm_multiply(Tmat, imtx);
+		cm_free(Tmat); 
 		cm_free(imtx);
 	} else {				/* sky vector/matrix only */
 		cmtx = cm_load(argv[a+1], 0, nsteps, skyfmt);
+		nsteps = cmtx->ncols;
 	}
 						/* prepare output stream */
 	if ((ofspec != NULL) & (nsteps == 1) && hasNumberFormat(ofspec)) {
@@ -209,7 +247,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",
@@ -220,7 +258,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) {
@@ -240,17 +278,31 @@ main(int argc, char *argv[])
 		CMATRIX	*Vmat = cm_load(argv[a], 0, cmtx->nrows, DTfromHeader);
 		CMATRIX	*rmtx = cm_multiply(Vmat, cmtx);
 		cm_free(Vmat);
-		if (ofspec != NULL)		/* multiple vector files? */
+		if (ofspec != NULL) {		/* multiple vector files? */
+			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 ((ofp = fopen(fnbuf, "w")) == NULL) {
+				sprintf(fnbuf, ofspec, i);
+				if ((ofp = fopen(fnbuf, wtype)) == NULL) {
 					fprintf(stderr,
 					"%s: cannot open '%s' for output\n",
 							progname, fnbuf);
 					return(1);
 				}
-				cm_print(rvec, ofp);
+#ifdef getc_unlocked
+				flockfile(ofp);
+#endif
+				if (headout) {	/* header output */
+					newheader("RADIANCE", ofp);
+					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);
+					fputc('\n', ofp);
+				}
+				cm_write(rvec, outfmt, ofp);
 				if (fclose(ofp) == EOF) {
 					fprintf(stderr,
 						"%s: error writing to '%s'\n",
@@ -260,8 +312,24 @@ main(int argc, char *argv[])
 				ofp = stdout;
 				cm_free(rvec);
 			}
-		else
-			cm_print(rmtx, ofp);
+		} else {
+#ifdef getc_unlocked
+			flockfile(ofp);
+#endif
+			if (outfmt != DTascii)
+				SET_FILE_BINARY(ofp);
+			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);
+				fputc('\n', ofp);
+			}
+			cm_write(rmtx, outfmt, ofp);
+		}
 		cm_free(rmtx);
 	}
 	if (fflush(ofp) == EOF) {		/* final clean-up */
@@ -271,9 +339,9 @@ main(int argc, char *argv[])
 	cm_free(cmtx);
 	return(0);
 userr:
-	fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-i{f|d}] DCspec [skyf]\n",
+	fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d}] DCspec [skyf]\n",
 				progname);
-	fprintf(stderr, "   or: %s [-n nsteps][-o ospec][-i{f|d}] Vspec Tbsdf.xml Dmat.dat [skyf]\n",
+	fprintf(stderr, "   or: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d}] Vspec Tbsdf Dmat.dat [skyf]\n",
 				progname);
 	return(1);
 }