--- ray/src/util/rcode_depth.c 2019/08/14 21:00:14 2.6 +++ ray/src/util/rcode_depth.c 2020/02/11 18:15:23 2.9 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rcode_depth.c,v 2.6 2019/08/14 21:00:14 greg Exp $"; +static const char RCSid[] = "$Id: rcode_depth.c,v 2.9 2020/02/11 18:15:23 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); @@ -281,6 +281,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; @@ -354,6 +355,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; @@ -365,7 +372,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; @@ -417,6 +429,11 @@ main(int argc, char *argv[]) /* 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;