| 23 |
|
#define ALL 3 |
| 24 |
|
#define BRIGHT 4 |
| 25 |
|
|
| 26 |
– |
#define brightonly (putprim==BRIGHT) |
| 27 |
– |
|
| 26 |
|
RESOLU picres; /* resolution of picture */ |
| 27 |
|
|
| 28 |
|
int uniq = 0; /* print only unique values? */ |
| 217 |
|
break; |
| 218 |
|
/* recognize special formats */ |
| 219 |
|
if (dataonly && format == 'b') |
| 220 |
< |
if (brightonly) |
| 223 |
< |
fmtid = "8-bit_grey"; |
| 224 |
< |
else |
| 220 |
> |
if (putprim == ALL) |
| 221 |
|
fmtid = "24-bit_rgb"; |
| 226 |
– |
if (dataonly && format == 'w') |
| 227 |
– |
if (brightonly) |
| 228 |
– |
fmtid = "16-bit_grey"; |
| 222 |
|
else |
| 223 |
+ |
fmtid = "8-bit_grey"; |
| 224 |
+ |
if (dataonly && format == 'w') |
| 225 |
+ |
if (putprim == ALL) |
| 226 |
|
fmtid = "48-bit_rgb"; |
| 227 |
+ |
else |
| 228 |
+ |
fmtid = "16-bit_grey"; |
| 229 |
|
/* assign reverse ordering */ |
| 230 |
|
rord[ord[0]] = 0; |
| 231 |
|
rord[ord[1]] = 1; |
| 239 |
|
progname, argv[i]); |
| 240 |
|
quit(1); |
| 241 |
|
} |
| 242 |
< |
if (reverse && !brightonly && i == argc-3) { |
| 242 |
> |
if (reverse && putprim != BRIGHT && i == argc-3) { |
| 243 |
|
if ((fin2 = fopen(argv[i+1], "r")) == NULL) { |
| 244 |
|
fprintf(stderr, "%s: can't open file \"%s\"\n", |
| 245 |
|
progname, argv[i+1]); |
| 253 |
|
interleave = -1; |
| 254 |
|
} else if (i != argc-1) |
| 255 |
|
fin = NULL; |
| 256 |
< |
if (reverse && !brightonly && !interleave) { |
| 256 |
> |
if (reverse && putprim != BRIGHT && !interleave) { |
| 257 |
|
fin2 = fopen(argv[i], "r"); |
| 258 |
|
fin3 = fopen(argv[i], "r"); |
| 259 |
|
} |
