22 |
|
{ |
23 |
|
fputs("Usage: ", stderr); |
24 |
|
fputs(progname, stderr); |
25 |
< |
fputs(" [-h[io]][-H[io]][-f[afd]] [input [output.nrm]]\n", stderr); |
25 |
> |
fputs(" [-h[io]][-H[io]][-f[afd]][-x xr -y yr] [input [output.nrm]]\n", stderr); |
26 |
|
fputs(" Or: ", stderr); |
27 |
|
fputs(progname, stderr); |
28 |
|
fputs(" -r [-i][-u][-h[io]][-H[io]][-f[afd]] [input.nrm [output]]\n", |
38 |
|
long nexpected = (long)ncp->res.xr * ncp->res.yr; |
39 |
|
|
40 |
|
if (ncp->inpfmt[0]) { |
41 |
< |
if (strcasestr(ncp->inpfmt, "ascii") != NULL) |
41 |
> |
if (!strcmp(ncp->inpfmt, "ascii")) |
42 |
|
ncp->format = 'a'; |
43 |
< |
else if (strcasestr(ncp->inpfmt, "float") != NULL) |
43 |
> |
else if (!strcmp(ncp->inpfmt, "float")) |
44 |
|
ncp->format = 'f'; |
45 |
< |
else if (strcasestr(ncp->inpfmt, "double") != NULL) |
45 |
> |
else if (!strcmp(ncp->inpfmt, "double")) |
46 |
|
ncp->format = 'd'; |
47 |
|
else { |
48 |
|
fputs(ncp->inpname, stderr); |
65 |
|
#ifdef SMLFLT |
66 |
|
case 'f': |
67 |
|
ok = (getbinary(nrm, sizeof(*nrm), 3, ncp->finp) == 3); |
68 |
+ |
if (ncp->swapped) |
69 |
+ |
swap32((char *)nrm, 3); |
70 |
|
break; |
71 |
|
case 'd': { |
72 |
< |
double nrmd[3]; |
73 |
< |
ok = (getbinary(nrmd, sizeof(*nrmd), |
74 |
< |
3, ncp->finp) == 3); |
75 |
< |
if (ok) VCOPY(nrm, nrmd); |
76 |
< |
} |
77 |
< |
break; |
72 |
> |
double nrmd[3]; |
73 |
> |
ok = (getbinary(nrmd, sizeof(*nrmd), |
74 |
> |
3, ncp->finp) == 3); |
75 |
> |
if (ncp->swapped) |
76 |
> |
swap64((char *)nrmd, 3); |
77 |
> |
if (ok) VCOPY(nrm, nrmd); |
78 |
> |
} break; |
79 |
|
#else |
80 |
|
case 'f': { |
81 |
< |
float nrmf[3]; |
82 |
< |
ok = (getbinary(nrmf, sizeof(*nrmf), |
83 |
< |
3, ncp->finp) == 3); |
84 |
< |
if (ok) VCOPY(nrm, nrmf); |
85 |
< |
} |
86 |
< |
break; |
81 |
> |
float nrmf[3]; |
82 |
> |
ok = (getbinary(nrmf, sizeof(*nrmf), |
83 |
> |
3, ncp->finp) == 3); |
84 |
> |
if (ncp->swapped) |
85 |
> |
swap32((char *)nrmf, 3); |
86 |
> |
if (ok) VCOPY(nrm, nrmf); |
87 |
> |
} break; |
88 |
|
case 'd': |
89 |
|
ok = (getbinary(nrm, sizeof(*nrm), 3, ncp->finp) == 3); |
90 |
+ |
if (ncp->swapped) |
91 |
+ |
swap64((char *)nrm, 3); |
92 |
|
break; |
93 |
|
#endif |
94 |
|
} |
216 |
|
int |
217 |
|
main(int argc, char *argv[]) |
218 |
|
{ |
219 |
+ |
int xres=0, yres=0; |
220 |
|
int reverse = 0; |
221 |
|
int bypixel = 0; |
222 |
|
int unbuffered = 0; |
278 |
|
usage_exit(1); |
279 |
|
} |
280 |
|
break; |
281 |
+ |
case 'x': |
282 |
+ |
xres = atoi(argv[++a]); |
283 |
+ |
break; |
284 |
+ |
case 'y': |
285 |
+ |
yres = atoi(argv[++a]); |
286 |
+ |
break; |
287 |
|
case 'i': |
288 |
|
bypixel++; |
289 |
|
break; |
295 |
|
} |
296 |
|
nc.hdrflags |= !reverse * HF_ENCODE; |
297 |
|
|
298 |
< |
if ((nc.hdrflags & (HF_RESIN|HF_RESOUT)) == HF_RESOUT) { |
298 |
> |
if ((xres > 0) & (yres > 0)) { |
299 |
> |
nc.hdrflags &= ~HF_RESIN; |
300 |
> |
nc.res.rt = PIXSTANDARD; |
301 |
> |
nc.res.xr = xres; |
302 |
> |
nc.res.yr = yres; |
303 |
> |
} else if ((nc.hdrflags & (HF_RESIN|HF_RESOUT)) == HF_RESOUT) { |
304 |
|
fputs(progname, stderr); |
305 |
|
fputs(": unknown resolution for output\n", stderr); |
306 |
|
return 1; |