34 |
|
exit(1); |
35 |
|
} |
36 |
|
|
37 |
– |
/* discard header */ |
38 |
– |
getheader(input, NULL); |
37 |
|
/* get picture dimensions */ |
38 |
< |
if (fgetresolu(&xres, &yres, input) != (YMAJOR|YDECR)) { |
39 |
< |
fprintf(stderr, "%s: bad picture size\n", argv[0]); |
38 |
> |
if (checkheader(input, COLRFMT, NULL) < 0 || |
39 |
> |
fgetresolu(&xres, &yres, input) != (YMAJOR|YDECR)) { |
40 |
> |
fprintf(stderr, "%s: bad picture format\n", argv[0]); |
41 |
|
exit(1); |
42 |
|
} |
43 |
|
if (xres > NCOLS) { |
50 |
|
fprintf(stderr, "%s: read error\n", argv[0]); |
51 |
|
exit(1); |
52 |
|
} |
53 |
< |
normcolrs(scanline, xres); |
53 |
> |
normcolrs(scanline, xres, 0); |
54 |
|
for (j = 0; j < xres; j++) |
55 |
|
putchar(shade(scanline[j])); |
56 |
|
putchar('\n'); |