--- ray/src/util/dctimestep.c	2013/01/19 22:30:55	2.27
+++ ray/src/util/dctimestep.c	2019/10/23 17:16:26	2.44
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: dctimestep.c,v 2.27 2013/01/19 22:30:55 greg Exp $";
+static const char RCSid[] = "$Id: dctimestep.c,v 2.44 2019/10/23 17:16:26 greg Exp $";
 #endif
 /*
  * Compute time-step result using Daylight Coefficient method.
@@ -8,516 +8,20 @@ static const char RCSid[] = "$Id: dctimestep.c,v 2.27 
  */
 
 #include <ctype.h>
+#include "platform.h"
 #include "standard.h"
+#include "cmatrix.h"
 #include "platform.h"
-#include "paths.h"
-#include "color.h"
 #include "resolu.h"
-#include "bsdf.h"
-#include "bsdf_m.h"
 
 char	*progname;			/* global argv[0] */
 
-/* Data types for file loading */
-enum {DTfromHeader, DTascii, DTfloat, DTdouble, DTrgbe, DTxyze};
-
-/* A color coefficient matrix -- vectors have ncols==1 */
-typedef struct {
-	int	nrows, ncols;
-	COLORV	cmem[3];		/* extends struct */
-} CMATRIX;
-
-#define COLSPEC	(sizeof(COLORV)==sizeof(float) ? "%f %f %f" : "%lf %lf %lf")
-
-#define cm_lval(cm,r,c)	((cm)->cmem + 3*((r)*(cm)->ncols + (c)))
-
-#define cv_lval(cm,i)	((cm)->cmem + 3*(i))
-
-/* Allocate a color coefficient matrix */
-static CMATRIX *
-cm_alloc(int nrows, int ncols)
-{
-	CMATRIX	*cm;
-
-	if ((nrows <= 0) | (ncols <= 0))
-		error(USER, "attempt to create empty matrix");
-	cm = (CMATRIX *)malloc(sizeof(CMATRIX) +
-				3*sizeof(COLORV)*(nrows*ncols - 1));
-	if (cm == NULL)
-		error(SYSTEM, "out of memory in cm_alloc()");
-	cm->nrows = nrows;
-	cm->ncols = ncols;
-	return(cm);
-}
-
-#define cm_free(cm)	free(cm)
-
-/* Resize color coefficient matrix */
-static CMATRIX *
-cm_resize(CMATRIX *cm, int nrows)
-{
-	if (nrows == cm->nrows)
-		return(cm);
-	if (nrows <= 0) {
-		cm_free(cm);
-		return(NULL);
-	}
-	cm = (CMATRIX *)realloc(cm, sizeof(CMATRIX) +
-			3*sizeof(COLORV)*(nrows*cm->ncols - 1));
-	if (cm == NULL)
-		error(SYSTEM, "out of memory in cm_resize()");
-	cm->nrows = nrows;
-	return(cm);
-}
-
-/* Load header to obtain data type */
-static int
-getDT(char *s, void *p)
-{
-	char	fmt[32];
-	
-	if (formatval(fmt, s)) {
-		if (!strcmp(fmt, "ascii"))
-			*((int *)p) = DTascii;
-		else if (!strcmp(fmt, "float"))
-			*((int *)p) = DTfloat;
-		else if (!strcmp(fmt, "double"))
-			*((int *)p) = DTdouble;
-		else if (!strcmp(fmt, COLRFMT))
-			*((int *)p) = DTrgbe;
-		else if (!strcmp(fmt, CIEFMT))
-			*((int *)p) = DTxyze;
-	}
-	return(0);
-}
-
-static int
-getDTfromHeader(FILE *fp)
-{
-	int	dt = DTfromHeader;
-	
-	if (getheader(fp, getDT, &dt) < 0)
-		error(SYSTEM, "header read error");
-	if (dt == DTfromHeader)
-		error(USER, "missing data format in header");
-	return(dt);
-}
-
-/* Allocate and load a matrix from the given file (or stdin if NULL) */
-static CMATRIX *
-cm_load(const char *fname, int nrows, int ncols, int dtype)
-{
-	FILE	*fp = stdin;
-	CMATRIX	*cm;
-
-	if (ncols <= 0)
-		error(USER, "Non-positive number of columns");
-	if (fname == NULL)
-		fname = "<stdin>";
-	else if ((fp = fopen(fname, "r")) == NULL) {
-		sprintf(errmsg, "cannot open file '%s'", fname);
-		error(SYSTEM, errmsg);
-	}
-#ifdef getc_unlocked
-	flockfile(fp);
-#endif
-	if (dtype != DTascii)
-		SET_FILE_BINARY(fp);		/* doesn't really work */
-	if (dtype == DTfromHeader)
-		dtype = getDTfromHeader(fp);
-	switch (dtype) {
-	case DTascii:
-	case DTfloat:
-	case DTdouble:
-		break;
-	default:
-		error(USER, "unexpected data type in cm_load()");
-	}
-	if (nrows <= 0) {			/* don't know length? */
-		int	guessrows = 147;	/* usually big enough */
-		if ((dtype != DTascii) & (fp != stdin)) {
-			long	startpos = ftell(fp);
-			if (fseek(fp, 0L, SEEK_END) == 0) {
-				long	endpos = ftell(fp);
-				long	elemsiz = 3*(dtype==DTfloat ?
-					    sizeof(float) : sizeof(double));
-
-				if ((endpos - startpos) % (ncols*elemsiz)) {
-					sprintf(errmsg,
-					"improper length for binary file '%s'",
-							fname);
-					error(USER, errmsg);
-				}
-				guessrows = (endpos - startpos)/(ncols*elemsiz);
-				if (fseek(fp, startpos, SEEK_SET) < 0) {
-					sprintf(errmsg,
-						"fseek() error on file '%s'",
-							fname);
-					error(SYSTEM, errmsg);
-				}
-				nrows = guessrows;	/* we're confident */
-			}
-		}
-		cm = cm_alloc(guessrows, ncols);
-	} else
-		cm = cm_alloc(nrows, ncols);
-	if (cm == NULL)					/* XXX never happens */
-		return(NULL);
-	if (dtype == DTascii) {				/* read text file */
-		int	maxrow = (nrows > 0 ? nrows : 32000);
-		int	r, c;
-		for (r = 0; r < maxrow; r++) {
-		    if (r >= cm->nrows)			/* need more space? */
-			cm = cm_resize(cm, 2*cm->nrows);
-		    for (c = 0; c < ncols; c++) {
-		        COLORV	*cv = cm_lval(cm,r,c);
-			if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3)
-				if ((nrows <= 0) & (r > 0) & !c) {
-					cm = cm_resize(cm, maxrow=r);
-					break;
-				} else
-					goto EOFerror;
-		    }
-		}
-		while ((c = getc(fp)) != EOF)
-			if (!isspace(c)) {
-				sprintf(errmsg,
-				"unexpected data at end of ascii file %s",
-						fname);
-				error(WARNING, errmsg);
-				break;
-			}
-	} else {					/* read binary file */
-		if (sizeof(COLORV) == (dtype==DTfloat ? sizeof(float) :
-							sizeof(double))) {
-			int	nread = 0;
-			do {				/* read all we can */
-				nread += fread(cm->cmem + 3*nread,
-						3*sizeof(COLORV),
-						cm->nrows*cm->ncols - nread,
-						fp);
-				if (nrows <= 0) {	/* unknown length */
-					if (nread == cm->nrows*cm->ncols)
-							/* need more space? */
-						cm = cm_resize(cm, 2*cm->nrows);
-					else if (nread && !(nread % cm->ncols))
-							/* seem to be  done */
-						cm = cm_resize(cm, nread/cm->ncols);
-					else		/* ended mid-row */
-						goto EOFerror;
-				} else if (nread < cm->nrows*cm->ncols)
-					goto EOFerror;
-			} while (nread < cm->nrows*cm->ncols);
-
-		} else if (dtype == DTdouble) {
-			double	dc[3];			/* load from double */
-			COLORV	*cvp = cm->cmem;
-			int	n = nrows*ncols;
-
-			if (n <= 0)
-				goto not_handled;
-			while (n--) {
-				if (fread(dc, sizeof(double), 3, fp) != 3)
-					goto EOFerror;
-				copycolor(cvp, dc);
-				cvp += 3;
-			}
-		} else /* dtype == DTfloat */ {
-			float	fc[3];			/* load from float */
-			COLORV	*cvp = cm->cmem;
-			int	n = nrows*ncols;
-
-			if (n <= 0)
-				goto not_handled;
-			while (n--) {
-				if (fread(fc, sizeof(float), 3, fp) != 3)
-					goto EOFerror;
-				copycolor(cvp, fc);
-				cvp += 3;
-			}
-		}
-		if (fgetc(fp) != EOF) {
-				sprintf(errmsg,
-				"unexpected data at end of binary file %s",
-						fname);
-				error(WARNING, errmsg);
-		}
-	}
-	if (fp != stdin)
-		fclose(fp);
-#ifdef getc_unlocked
-	else
-		funlockfile(fp);
-#endif
-	return(cm);
-EOFerror:
-	sprintf(errmsg, "unexpected EOF reading %s", fname);
-	error(USER, errmsg);
-not_handled:
-	error(INTERNAL, "unhandled data size or length in cm_load()");
-	return(NULL);	/* gratis return */
-}
-
-/* Extract a column vector from a matrix */
-static CMATRIX *
-cm_column(const CMATRIX *cm, int c)
-{
-	CMATRIX	*cvr;
-	int	dr;
-
-	if ((c < 0) | (c >= cm->ncols))
-		error(INTERNAL, "column requested outside matrix");
-	cvr = cm_alloc(cm->nrows, 1);
-	if (cvr == NULL)
-		return(NULL);
-	for (dr = 0; dr < cm->nrows; dr++) {
-		const COLORV	*sp = cm_lval(cm,dr,c);
-		COLORV		*dp = cv_lval(cvr,dr);
-		dp[0] = sp[0];
-		dp[1] = sp[1];
-		dp[2] = sp[2];
-	}
-	return(cvr);
-}
-
-/* Scale a matrix by a single value */
-static CMATRIX *
-cm_scale(const CMATRIX *cm1, const COLOR sca)
-{
-	CMATRIX	*cmr;
-	int	dr, dc;
-
-	cmr = cm_alloc(cm1->nrows, cm1->ncols);
-	if (cmr == NULL)
-		return(NULL);
-	for (dr = 0; dr < cmr->nrows; dr++)
-	    for (dc = 0; dc < cmr->ncols; dc++) {
-	        const COLORV	*sp = cm_lval(cm1,dr,dc);
-		COLORV		*dp = cm_lval(cmr,dr,dc);
-		dp[0] = sp[0] * sca[0];
-		dp[1] = sp[1] * sca[1];
-		dp[2] = sp[2] * sca[2];
-	    }
-	return(cmr);
-}
-
-/* Multiply two matrices (or a matrix and a vector) and allocate the result */
-static CMATRIX *
-cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2)
-{
-	char	*rowcheck=NULL, *colcheck=NULL;
-	CMATRIX	*cmr;
-	int	dr, dc, i;
-
-	if ((cm1->ncols <= 0) | (cm1->ncols != cm2->nrows))
-		error(INTERNAL, "matrix dimension mismatch in cm_multiply()");
-	cmr = cm_alloc(cm1->nrows, cm2->ncols);
-	if (cmr == NULL)
-		return(NULL);
-				/* optimization: check for zero rows & cols */
-	if (((cm1->nrows > 5) | (cm2->ncols > 5)) & (cm1->ncols > 5)) {
-		static const COLOR	czero;
-		rowcheck = (char *)calloc(cmr->nrows, 1);
-		for (dr = cm1->nrows*(rowcheck != NULL); dr--; )
-		    for (dc = cm1->ncols; dc--; )
-			if (memcmp(cm_lval(cm1,dr,dc), czero, sizeof(COLOR))) {
-				rowcheck[dr] = 1;
-				break;
-			}
-		colcheck = (char *)calloc(cmr->ncols, 1);
-		for (dc = cm2->ncols*(colcheck != NULL); dc--; )
-		    for (dr = cm2->nrows; dr--; )
-			if (memcmp(cm_lval(cm2,dr,dc), czero, sizeof(COLOR))) {
-				colcheck[dc] = 1;
-				break;
-			}
-	}
-	for (dr = 0; dr < cmr->nrows; dr++)
-	    for (dc = 0; dc < cmr->ncols; dc++) {
-		COLORV	*dp = cm_lval(cmr,dr,dc);
-		dp[0] = dp[1] = dp[2] = 0;
-		if (rowcheck != NULL && !rowcheck[dr])
-			continue;
-		if (colcheck != NULL && !colcheck[dc])
-			continue;
-		for (i = 0; i < cm1->ncols; i++) {
-		    const COLORV	*cp1 = cm_lval(cm1,dr,i);
-		    const COLORV	*cp2 = cm_lval(cm2,i,dc);
-		    dp[0] += cp1[0] * cp2[0];
-		    dp[1] += cp1[1] * cp2[1];
-		    dp[2] += cp1[2] * cp2[2];
-		}
-	    }
-	if (rowcheck != NULL) free(rowcheck);
-	if (colcheck != NULL) free(colcheck);
-	return(cmr);
-}
-
-/* print out matrix as ASCII text -- no header */
-static void
-cm_print(const CMATRIX *cm, FILE *fp)
-{
-	int		r, c;
-	const COLORV	*mp = cm->cmem;
-	
-	for (r = 0; r < cm->nrows; r++) {
-		for (c = 0; c < cm->ncols; c++, mp += 3)
-			fprintf(fp, "\t%.6e %.6e %.6e", mp[0], mp[1], mp[2]);
-		fputc('\n', fp);
-	}
-}
-
-/* Convert a BSDF to our matrix representation */
-static CMATRIX *
-cm_bsdf(const COLOR bsdfLamb, const COLOR specCol, const SDMat *bsdf)
-{
-	CMATRIX	*cm = cm_alloc(bsdf->nout, bsdf->ninc);
-	int	nbadohm = 0;
-	int	nneg = 0;
-	int	r, c;
-					/* loop over incident angles */
-	for (c = 0; c < cm->ncols; c++) {
-		const double	dom = mBSDF_incohm(bsdf,c);
-					/* projected solid angle */
-		nbadohm += (dom <= 0);
-
-		for (r = 0; r < cm->nrows; r++) {
-			float	f = mBSDF_value(bsdf,c,r);
-			COLORV	*mp = cm_lval(cm,r,c);
-					/* check BSDF value */
-			if ((f <= 0) | (dom <= 0)) {
-				nneg += (f < -FTINY);
-				f = .0f;
-			}
-			copycolor(mp, specCol);
-			scalecolor(mp, f);
-			addcolor(mp, bsdfLamb);
-			scalecolor(mp, dom);
-		}
-	}
-	if (nneg | nbadohm) {
-		sprintf(errmsg,
-		    "BTDF has %d negatives and %d bad incoming solid angles",
-				nneg, nbadohm);
-		error(WARNING, errmsg);
-	}
-	return(cm);
-}
-
-/* Convert between input and output indices for reciprocity */
-static int
-recip_out_from_in(const SDMat *bsdf, int in_recip)
-{
-	FVECT	v;
-
-	if (!mBSDF_incvec(v, bsdf, in_recip+.5))
-		return(in_recip);		/* XXX should be error! */
-	v[2] = -v[2];
-	return(mBSDF_outndx(bsdf, v));
-}
-
-/* Convert between output and input indices for reciprocity */
-static int
-recip_in_from_out(const SDMat *bsdf, int out_recip)
-{
-	FVECT	v;
-
-	if (!mBSDF_outvec(v, bsdf, out_recip+.5))
-		return(out_recip);		/* XXX should be error! */
-	v[2] = -v[2];
-	return(mBSDF_incndx(bsdf, v));
-}
-
-/* Convert a BSDF to our matrix representation, applying reciprocity */
-static CMATRIX *
-cm_bsdf_recip(const COLOR bsdfLamb, const COLOR specCol, const SDMat *bsdf)
-{
-	CMATRIX	*cm = cm_alloc(bsdf->ninc, bsdf->nout);
-	int	nbadohm = 0;
-	int	nneg = 0;
-	int	r, c;
-					/* loop over incident angles */
-	for (c = 0; c < cm->ncols; c++) {
-		const int	ro = recip_out_from_in(bsdf,c);
-		const double	dom = mBSDF_outohm(bsdf,ro);
-					/* projected solid angle */
-		nbadohm += (dom <= 0);
-
-		for (r = 0; r < cm->nrows; r++) {
-			const int	ri = recip_in_from_out(bsdf,r);
-			float		f = mBSDF_value(bsdf,ri,ro);
-			COLORV		*mp = cm_lval(cm,r,c);
-					/* check BSDF value */
-			if ((f <= 0) | (dom <= 0)) {
-				nneg += (f < -FTINY);
-				f = .0f;
-			}
-			copycolor(mp, specCol);
-			scalecolor(mp, f);
-			addcolor(mp, bsdfLamb);
-			scalecolor(mp, dom);
-		}
-	}
-	if (nneg | nbadohm) {
-		sprintf(errmsg,
-		    "BTDF has %d negatives and %d bad incoming solid angles",
-				nneg, nbadohm);
-		error(WARNING, errmsg);
-	}
-	return(cm);
-}
-
-/* Load and convert a matrix BSDF from the given XML file */
-static CMATRIX *
-cm_loadBSDF(char *fname, COLOR cLamb)
-{
-	CMATRIX		*Tmat;
-	char		*fpath;
-	int		recip;
-	SDError		ec;
-	SDData		myBSDF;
-	SDSpectralDF	*tdf;
-	COLOR		bsdfLamb, specCol;
-					/* find path to BSDF file */
-	fpath = getpath(fname, getrlibpath(), R_OK);
-	if (fpath == NULL) {
-		sprintf(errmsg, "cannot find BSDF file '%s'", fname);
-		error(USER, errmsg);
-	}
-	SDclearBSDF(&myBSDF, fname);	/* load XML and check type */
-	ec = SDloadFile(&myBSDF, fpath);
-	if (ec)
-		error(USER, transSDError(ec));
-	ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, bsdfLamb);
-	recip = (myBSDF.tb == NULL);
-	tdf = recip ? myBSDF.tf : myBSDF.tb;
-	if (tdf == NULL) {		/* no non-Lambertian transmission? */
-		if (cLamb != NULL)
-			copycolor(cLamb, bsdfLamb);
-		SDfreeBSDF(&myBSDF);
-		return(NULL);
-	}
-	if (tdf->ncomp != 1 || tdf->comp[0].func != &SDhandleMtx) {
-		sprintf(errmsg, "unsupported BSDF '%s'", fpath);
-		error(USER, errmsg);
-	}
-					/* convert BTDF to matrix */
-	ccy2rgb(&tdf->comp[0].cspec[0], 1., specCol);
-	Tmat = recip ? cm_bsdf_recip(bsdfLamb, specCol, (SDMat *)tdf->comp[0].dist)
-			: cm_bsdf(bsdfLamb, specCol, (SDMat *)tdf->comp[0].dist);
-	if (cLamb != NULL)		/* Lambertian is included */
-		setcolor(cLamb, .0, .0, .0);
-					/* free BSDF and return */
-	SDfreeBSDF(&myBSDF);
-	return(Tmat);
-}
-
 /* Sum together a set of images and write result to fout */
 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;
@@ -526,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);
@@ -550,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 */
@@ -618,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 */
@@ -632,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]) {
@@ -653,6 +173,27 @@ 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;
+			case 'c':
+				outfmt = DTrgbe;
+				break;
+			default:
+				goto userr;
+			}
+			break;
 		default:
 			goto userr;
 		}
@@ -660,27 +201,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)) {
@@ -696,6 +240,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);
@@ -706,7 +254,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",
@@ -717,7 +265,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) {
@@ -737,17 +285,33 @@ 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);
+					if ((outfmt == 'f') | (outfmt == 'd'))
+						fputendian(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",
@@ -757,8 +321,26 @@ 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);
+				if ((outfmt == 'f') | (outfmt == 'd'))
+					fputendian(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 */
@@ -768,9 +350,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|c}] 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|c}] Vspec Tbsdf Dmat.dat [skyf]\n",
 				progname);
 	return(1);
 }