18 |
|
|
19 |
|
VIEW vw = STDVIEW; |
20 |
|
int gotvw = 0; |
21 |
< |
char fmt[MAXFMTLEN] = "Unknown"; |
21 |
> |
char fmt[MAXFMTLEN] = "ascii"; /* assumed when unspecified */ |
22 |
|
int ncomp = 0; |
23 |
|
RESOLU res; |
24 |
|
int rmin, cmin, nrows, ncols; |
79 |
|
return(1); |
80 |
|
writerr: |
81 |
|
fputs(progname, stderr); |
82 |
< |
fputs(": error writing scanline\n", stderr); |
82 |
> |
fputs(": error writing picture\n", stderr); |
83 |
|
return(0); |
84 |
|
readerr: |
85 |
|
fputs(progname, stderr); |
86 |
< |
fputs(": error reading scanline\n", stderr); |
86 |
> |
fputs(": error reading picture\n", stderr); |
87 |
|
return(0); |
88 |
|
} |
89 |
|
|
91 |
|
static int |
92 |
|
binary_copyf(FILE *fp, int asize) |
93 |
|
{ |
94 |
< |
const int skip_thresh = 1024; |
94 |
> |
const int skip_thresh = 8192; |
95 |
|
const size_t elsiz = asize*ncomp; |
96 |
|
const int width = scanlen(&res); |
97 |
|
const long skip_len = (width-ncols)*elsiz; |
234 |
|
fputs(": cannot open for writing\n", stderr); |
235 |
|
return(1); |
236 |
|
} |
237 |
+ |
#ifdef getc_unlocked /* avoid stupid semaphores */ |
238 |
+ |
flockfile(fp); |
239 |
+ |
flockfile(stdout); |
240 |
+ |
#endif |
241 |
|
/* process information header */ |
242 |
|
if (getheader(fp, headline, NULL) < 0) { |
243 |
|
fputs(progname, stderr); |
262 |
|
return(1); |
263 |
|
} |
264 |
|
printargs(argc, argv, stdout); |
265 |
< |
if (gotvw) { |
265 |
> |
if (gotvw) { /* adjust view? */ |
266 |
|
double p0[2], p1[2]; |
267 |
|
const char *err; |
268 |
|
if (res.rt & YMAJOR) { |
291 |
|
fputs(err, stderr); |
292 |
|
fputc('\n', stderr); |
293 |
|
return(1); |
294 |
+ |
} else { |
295 |
+ |
fputs(VIEWSTR, stdout); |
296 |
+ |
fprintview(&vw, stdout); |
297 |
+ |
fputc('\n', stdout); |
298 |
|
} |
291 |
– |
fputs(VIEWSTR, stdout); |
292 |
– |
fprintview(&vw, stdout); |
293 |
– |
fputc('\n', stdout); |
299 |
|
} |
300 |
|
if (gotdims) |
301 |
|
printf("NROWS=%d\nNCOLS=%d\n", nrows, ncols); |
320 |
|
asiz = sizeof(float); |
321 |
|
} else if (!strcmp(fmt, "double")) { |
322 |
|
asiz = sizeof(double); |
323 |
+ |
} else if (!strcmp(fmt, "32-bit_encoded_normal")) { |
324 |
+ |
asiz = 4; |
325 |
+ |
ncomp = 1; |
326 |
+ |
} else if (!strcmp(fmt, "16-bit_encoded_depth")) { |
327 |
+ |
asiz = 2; |
328 |
+ |
ncomp = 1; |
329 |
|
} else if (globmatch(PICFMT, fmt)) { |
330 |
|
asiz = -1; |
331 |
|
if (!ncomp) ncomp = 3; |
332 |
+ |
else ncomp *= (ncomp == 3); |
333 |
|
} else if (strcasecmp(fmt, "ascii")) { |
334 |
|
fputs(progname, stderr); |
335 |
|
fputs(": unsupported format - ", stderr); |
345 |
|
if (!(asiz < 0 ? colr_copyf(fp) : |
346 |
|
!asiz ? ascii_copyf(fp) : binary_copyf(fp, asiz))) |
347 |
|
return(1); |
348 |
+ |
/* need to consume the rest? */ |
349 |
+ |
if (fp == stdin && rmin+nrows < numscans(&res) && |
350 |
+ |
fseek(fp, 0L, SEEK_END) < 0) |
351 |
+ |
while (getc(fp) != EOF) |
352 |
+ |
; |
353 |
|
return(0); |
354 |
|
usage: |
355 |
|
fputs("Usage: ", stderr); |