--- ray/src/px/ra_bmp.c	2004/04/30 17:00:29	2.4
+++ ray/src/px/ra_bmp.c	2004/04/30 17:56:06	2.6
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: ra_bmp.c,v 2.4 2004/04/30 17:00:29 greg Exp $";
+static const char RCSid[] = "$Id: ra_bmp.c,v 2.6 2004/04/30 17:56:06 greg Exp $";
 #endif
 /*
  *  program to convert between RADIANCE and Windows BMP file
@@ -41,7 +41,7 @@ main(int argc, char *argv[])
 	progname = argv[0];
 
 	for (i = 1; i < argc; i++)
-		if (argv[i][0] == '-')
+		if (argv[i][0] == '-' && argv[i][1])
 			switch (argv[i][1]) {
 			case 'b':
 				rgbp = NULL;
@@ -72,8 +72,6 @@ main(int argc, char *argv[])
 			case 'r':
 				reverse = !reverse;
 				break;
-			case '\0':
-				break;
 			default:
 				goto userr;
 			}
@@ -335,7 +333,8 @@ tmap2bmp(char *fnin, char *fnout, char *expec, RGBPRIM
 					/* initialize BMP header */
 	if (tmflags & TM_F_BW) {
 		hdr = BMPmappedHeader(xr, yr, 0, 256);
-		hdr->compr = BI_RLE8;
+		if (fnout != NULL)
+			hdr->compr = BI_RLE8;
 	} else
 		hdr = BMPtruecolorHeader(xr, yr, 0);
 	if (hdr == NULL)