--- ray/src/util/rcode_depth.c	2019/07/20 02:07:23	2.4
+++ ray/src/util/rcode_depth.c	2022/06/30 00:16:49	2.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcode_depth.c,v 2.4 2019/07/20 02:07:23 greg Exp $";
+static const char RCSid[] = "$Id: rcode_depth.c,v 2.12 2022/06/30 00:16:49 greg Exp $";
 #endif
 /*
  * Encode and decode depth map using 16-bit integers
@@ -27,7 +27,7 @@ usage_exit(int code)
 	fputs("Usage: ", stderr);
 	fputs(progname, stderr);
 	fputs(
-	" [-d ref_depth/unit][-h[io]][-H[io]][-f[afd]] [input [output.dpt]]\n",
+	" [-d ref_depth/unit][-h[io]][-H[io]][-f[afd]][-x xr -y yr] [input [output.dpt]]\n",
 			stderr);
 	fputs("   Or: ", stderr);
 	fputs(progname, stderr);
@@ -45,11 +45,11 @@ encode_depths(DEPTHCODEC *dcp)
 	long	nexpected = (long)dcp->res.xr * dcp->res.yr;
 
 	if (dcp->inpfmt[0]) {
-		if (strcasestr(dcp->inpfmt, "ascii") != NULL)
+		if (!strcmp(dcp->inpfmt, "ascii"))
 			dcp->format = 'a';
-		else if (strcasestr(dcp->inpfmt, "float") != NULL)
+		else if (!strcmp(dcp->inpfmt, "float"))
 			dcp->format = 'f';
-		else if (strcasestr(dcp->inpfmt, "double") != NULL)
+		else if (!strcmp(dcp->inpfmt, "double"))
 			dcp->format = 'd';
 		else {
 			fputs(dcp->inpname, stderr);
@@ -59,6 +59,8 @@ encode_depths(DEPTHCODEC *dcp)
 			return 0;
 		}
 	}
+	if (dcp->format == 'a')
+		SET_FILE_TEXT(dcp->finp);
 
 	do {
 		int	ok = 0;
@@ -71,10 +73,14 @@ encode_depths(DEPTHCODEC *dcp)
 			break;
 		case 'f':
 			ok = (getbinary(&f, sizeof(f), 1, dcp->finp) == 1);
+			if (dcp->swapped)
+				swap32((char *)&f, 1);
 			d = f;
 			break;
 		case 'd':
 			ok = (getbinary(&d, sizeof(d), 1, dcp->finp) == 1);
+			if (dcp->swapped)
+				swap64((char *)&d, 1);
 			break;
 		}
 		if (!ok)
@@ -156,16 +162,12 @@ pixel_depths(DEPTHCODEC *dcp, int unbuf)
 		return 0;
 
 	while (scanf("%d %d", &xy[0], &xy[1]) == 2) {
-
-		loc2pix(xy, &dcp->res,
-			(xy[0]+.5)/dcp->res.xr, (xy[1]+.5)/dcp->res.yr);
-
+		loc2pix(xy, &dcp->res, xy[0]/(double)dcp->res.xr,
+				xy[1]/(double)dcp->res.yr);
 		d = decode_depth_pix(dcp, xy[0], xy[1]);
 		if (d < -FTINY)
 			return 0;
-
 		output_depth(dcp, d);
-
 		if (unbuf && fflush(stdout) == EOF) {
 			fputs(progname, stderr);
 			fputs(": write error on output\n", stderr);
@@ -252,10 +254,10 @@ pixel_points(DEPTHCODEC *dcp, int unbuf)
 	}
 	if (!check_decode_worldpos(dcp))
 		return 0;
-	
+
 	while (scanf("%d %d", &xy[0], &xy[1]) == 2) {
-		loc2pix(xy, &dcp->res,
-			(xy[0]+.5)/dcp->res.xr, (xy[1]+.5)/dcp->res.yr);
+		loc2pix(xy, &dcp->res, xy[0]/(double)dcp->res.xr,
+				xy[1]/(double)dcp->res.yr);
 		if (get_worldpos_pix(wpos, dcp, xy[0], xy[1]) < 0)
 			return 0;
 		output_worldpos(dcp, wpos);
@@ -277,6 +279,7 @@ pixel_points(DEPTHCODEC *dcp, int unbuf)
 int
 main(int argc, char *argv[])
 {
+	int		xres=0, yres=0;
 	int		conversion = CV_FWD;
 	int		bypixel = 0;
 	int		unbuffered = 0;
@@ -350,6 +353,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;
@@ -361,7 +370,12 @@ main(int argc, char *argv[])
 		}
 	dc.hdrflags |= (conversion == CV_FWD) * HF_ENCODE;
 
-	if ((dc.hdrflags & (HF_RESIN|HF_RESOUT)) == HF_RESOUT) {
+	if ((xres > 0) & (yres > 0)) {
+		dc.hdrflags &= ~HF_RESIN;
+		dc.res.rt = PIXSTANDARD;
+		dc.res.xr = xres;
+		dc.res.yr = yres;
+	} else if ((dc.hdrflags & (HF_RESIN|HF_RESOUT)) == HF_RESOUT) {
 		fputs(progname, stderr);
 		fputs(": unknown resolution for output\n", stderr);
 		return 1;
@@ -400,9 +414,8 @@ main(int argc, char *argv[])
 		fputs(": cannot open for writing\n", stderr);
 		return 1;
 	}
-	SET_FILE_BINARY(dc.finp);
-	if ((conversion != CV_FWD) | (dc.format != 'a'))
-		SET_FILE_BINARY(stdout);
+	SET_FILE_BINARY(dc.finp);	/* starting assumption */
+	SET_FILE_BINARY(stdout);
 #ifdef getc_unlocked			/* avoid stupid semaphores */
 	flockfile(dc.finp);
 	flockfile(stdout);
@@ -410,9 +423,17 @@ main(int argc, char *argv[])
 					/* read/copy header */
 	if (!process_dc_header(&dc, a, argv))
 		return 1;
+		
+	if ((conversion != CV_FWD) & (dc.format == 'a'))
+		SET_FILE_TEXT(stdout);
 					/* process data */
 	switch (conversion) {
 	case CV_FWD:			/* distance -> depth code */
+		if (!strcmp(dc.depth_unit, "1")) {
+			fputs(progname, stderr);
+			fputs(": warning - using reference depth of 1.0\n",
+					stderr);
+		}
 		if (!encode_depths(&dc))
 			return 1;
 		break;