--- ray/src/util/rcode_depth.c 2019/07/20 02:07:23 2.4 +++ ray/src/util/rcode_depth.c 2019/11/13 18:20:47 2.8 @@ -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.8 2019/11/13 18:20:47 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 (strstr(dcp->inpfmt, "ascii") != NULL) dcp->format = 'a'; - else if (strcasestr(dcp->inpfmt, "float") != NULL) + else if (strstr(dcp->inpfmt, "float") != NULL) dcp->format = 'f'; - else if (strcasestr(dcp->inpfmt, "double") != NULL) + else if (strstr(dcp->inpfmt, "double") != NULL) dcp->format = 'd'; else { fputs(dcp->inpname, stderr); @@ -71,10 +71,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) @@ -277,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; @@ -350,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; @@ -361,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;