--- ray/src/util/rcode_norm.c	2019/07/20 02:07:23	2.2
+++ ray/src/util/rcode_norm.c	2020/07/24 16:00:10	2.9
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcode_norm.c,v 2.2 2019/07/20 02:07:23 greg Exp $";
+static const char RCSid[] = "$Id: rcode_norm.c,v 2.9 2020/07/24 16:00:10 greg Exp $";
 #endif
 /*
  * Encode and decode surface normal map using 32-bit integers
@@ -22,7 +22,7 @@ usage_exit(int code)
 {
 	fputs("Usage: ", stderr);
 	fputs(progname, stderr);
-	fputs(" [-h[io]][-H[io]][-f[afd]] [input [output.nrm]]\n", stderr);
+	fputs(" [-h[io]][-H[io]][-f[afd]][-x xr -y yr] [input [output.nrm]]\n", stderr);
 	fputs("   Or: ", stderr);
 	fputs(progname, stderr);
 	fputs(" -r [-i][-u][-h[io]][-H[io]][-f[afd]] [input.nrm [output]]\n",
@@ -38,11 +38,11 @@ encode_normals(NORMCODEC *ncp)
 	long	nexpected = (long)ncp->res.xr * ncp->res.yr;
 
 	if (ncp->inpfmt[0]) {
-		if (strcasestr(ncp->inpfmt, "ascii") != NULL)
+		if (!strcmp(ncp->inpfmt, "ascii"))
 			ncp->format = 'a';
-		else if (strcasestr(ncp->inpfmt, "float") != NULL)
+		else if (!strcmp(ncp->inpfmt, "float"))
 			ncp->format = 'f';
-		else if (strcasestr(ncp->inpfmt, "double") != NULL)
+		else if (!strcmp(ncp->inpfmt, "double"))
 			ncp->format = 'd';
 		else {
 			fputs(ncp->inpname, stderr);
@@ -52,6 +52,8 @@ encode_normals(NORMCODEC *ncp)
 			return 0;
 		}
 	}
+	if (ncp->format == 'a')
+		SET_FILE_TEXT(ncp->finp);
 
 	do {
 		int	ok = 0;
@@ -65,24 +67,30 @@ encode_normals(NORMCODEC *ncp)
 #ifdef SMLFLT
 		case 'f':
 			ok = (getbinary(nrm, sizeof(*nrm), 3, ncp->finp) == 3);
+			if (ncp->swapped)
+				swap32((char *)nrm, 3);
 			break;
 		case 'd': {
-				double	nrmd[3];
-				ok = (getbinary(nrmd, sizeof(*nrmd),
-						3, ncp->finp) == 3);
-				if (ok) VCOPY(nrm, nrmd);
-			}
-			break;
+			double	nrmd[3];
+			ok = (getbinary(nrmd, sizeof(*nrmd),
+					3, ncp->finp) == 3);
+			if (ncp->swapped)
+				swap64((char *)nrmd, 3);
+			if (ok) VCOPY(nrm, nrmd);
+			} break;
 #else
 		case 'f': {
-				float	nrmf[3];
-				ok = (getbinary(nrmf, sizeof(*nrmf),
-						3, ncp->finp) == 3);
-				if (ok) VCOPY(nrm, nrmf);
-			}
-			break;
+			float	nrmf[3];
+			ok = (getbinary(nrmf, sizeof(*nrmf),
+					3, ncp->finp) == 3);
+			if (ncp->swapped)
+				swap32((char *)nrmf, 3);
+			if (ok) VCOPY(nrm, nrmf);
+			} break;
 		case 'd':
 			ok = (getbinary(nrm, sizeof(*nrm), 3, ncp->finp) == 3);
+			if (ncp->swapped)
+				swap64((char *)nrm, 3);
 			break;
 #endif
 		}
@@ -183,6 +191,7 @@ pixel_normals(NORMCODEC *ncp, int unbuf)
 		fputs(": can only handle standard pixel ordering\n", stderr);
 		return 0;
 	}
+
 	while (scanf("%d %d", &x, &y) == 2) {
 
 		y = ncp->res.yr-1 - y;
@@ -210,6 +219,7 @@ pixel_normals(NORMCODEC *ncp, int unbuf)
 int
 main(int argc, char *argv[])
 {
+	int		xres=0, yres=0;
 	int		reverse = 0;
 	int		bypixel = 0;
 	int		unbuffered = 0;
@@ -271,6 +281,12 @@ main(int argc, char *argv[])
 				usage_exit(1);
 			}
 			break;
+		case 'x':
+			xres = atoi(argv[++a]);
+			break;
+		case 'y':
+			yres = atoi(argv[++a]);
+			break;
 		case 'i':
 			bypixel++;
 			break;
@@ -282,7 +298,12 @@ main(int argc, char *argv[])
 		}
 	nc.hdrflags |= !reverse * HF_ENCODE;
 
-	if ((nc.hdrflags & (HF_RESIN|HF_RESOUT)) == HF_RESOUT) {
+	if ((xres > 0) & (yres > 0)) {
+		nc.hdrflags &= ~HF_RESIN;
+		nc.res.rt = PIXSTANDARD;
+		nc.res.xr = xres;
+		nc.res.yr = yres;
+	} else if ((nc.hdrflags & (HF_RESIN|HF_RESOUT)) == HF_RESOUT) {
 		fputs(progname, stderr);
 		fputs(": unknown resolution for output\n", stderr);
 		return 1;
@@ -321,9 +342,8 @@ main(int argc, char *argv[])
 		fputs(": cannot open for writing\n", stderr);
 		return 1;
 	}
-	SET_FILE_BINARY(nc.finp);
-	if (reverse || nc.format != 'a')
-		SET_FILE_BINARY(stdout);
+	SET_FILE_BINARY(nc.finp);	/* starting assumption */
+	SET_FILE_BINARY(stdout);
 #ifdef getc_unlocked			/* avoid stupid semaphores */
 	flockfile(nc.finp);
 	flockfile(stdout);
@@ -331,6 +351,9 @@ main(int argc, char *argv[])
 					/* read/copy header */
 	if (!process_nc_header(&nc, a, argv))
 		return 1;
+
+	if (reverse && nc.format == 'a')
+		SET_FILE_TEXT(stdout);
 					/* process data */
 	if (!reverse) {
 		if (!encode_normals(&nc))