--- ray/src/util/rmtxop.c	2014/05/31 19:21:21	2.2
+++ ray/src/util/rmtxop.c	2014/12/16 20:21:46	2.6
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmtxop.c,v 2.2 2014/05/31 19:21:21 greg Exp $";
+static const char RCSid[] = "$Id: rmtxop.c,v 2.6 2014/12/16 20:21:46 greg Exp $";
 #endif
 /*
  * General component matrix operations.
@@ -22,7 +22,7 @@ typedef struct {
 	int		op;			/* '*' or '+' */
 } ROPERAT;				/* matrix operation */
 
-int	outfmt = DTascii;		/* output format */
+int	outfmt = DTfromHeader;		/* output format */
 int	verbose = 0;			/* verbose reporting? */
 
 static void
@@ -167,7 +167,6 @@ main(int argc, char *argv[])
 {
 	RMATRIX	*mres = NULL;
 	ROPERAT	op;
-	long	nbw;
 	int	i;
 					/* initialize */
 	op_default(&op);
@@ -232,16 +231,22 @@ main(int argc, char *argv[])
 	if (mres == NULL)		/* check that we got something */
 		goto userr;
 					/* write result to stdout */
+#ifdef getc_unlocked
+	flockfile(stdout);
+#endif
+	if (outfmt == DTfromHeader)
+		outfmt = mres->dtype;
+#ifdef _WIN32
+	if (outfmt != DTascii)
+		_setmode(fileno(stdout), _O_BINARY);
+#endif
 	newheader("RADIANCE", stdout);
 	printargs(argc, argv, stdout);
-	nbw = rmx_write(mres, outfmt, stdout);
-	/* rmx_free(mres); mres = NULL; */
-	if (nbw <= 0) {
+	if (!rmx_write(mres, outfmt, stdout)) {
 		fprintf(stderr, "%s: error writing result matrix\n", argv[0]);
 		return(1);
 	}
-	if (verbose)
-		fprintf(stderr, "%s: %ld bytes written\n", argv[0], nbw);
+	/* rmx_free(mres); mres = NULL; */
 	return(0);
 userr:
 	fprintf(stderr,