20 |
|
|
21 |
|
char *mbcalfile = NULL; /* macbethcal mapping file */ |
22 |
|
|
23 |
< |
static struct mbc mbcond; /* macbethcal conditioning struct */ |
23 |
> |
static struct mbc { |
24 |
> |
float xa[3][6], ya[3][6]; |
25 |
> |
COLORMAT cmat; |
26 |
> |
} mbcond; /* macbethcal conditioning struct */ |
27 |
|
|
28 |
|
static COLOR *scanbuf; /* scanline processing buffer */ |
29 |
|
static int nread; /* number of scanlines processed */ |
60 |
|
nextscan() /* read and condition next scanline */ |
61 |
|
{ |
62 |
|
if (nread >= numscans(&inpres)) { |
63 |
< |
#ifdef DEBUG |
64 |
< |
fputs("done\n", stderr); |
62 |
< |
#endif |
63 |
< |
return(NULL); |
63 |
> |
free((char *)scanbuf); |
64 |
> |
return(scanbuf = NULL); |
65 |
|
} |
66 |
< |
if (freadscan(scanbuf, scanlen(&inpres), infp) < 0) { |
66 |
> |
if (what2do&DO_ACUITY) |
67 |
> |
acuscan(scanbuf, nread); |
68 |
> |
else if (freadscan(scanbuf, scanlen(&inpres), infp) < 0) { |
69 |
|
fprintf(stderr, "%s: %s: scanline read error\n", |
70 |
|
progname, infn); |
71 |
|
exit(1); |
72 |
|
} |
70 |
– |
nread++; |
73 |
|
if (what2do&DO_VEIL) /* add veiling */ |
74 |
< |
addveil(scanbuf, nread-1); |
74 |
> |
addveil(scanbuf, nread); |
75 |
|
if (what2do&DO_COLOR) /* scotopic color loss */ |
76 |
|
scotscan(scanbuf, scanlen(&inpres)); |
77 |
|
if (what2do&DO_LINEAR) /* map luminances */ |
82 |
|
mbscan(scanbuf, scanlen(&inpres), &mbcond); |
83 |
|
else if (lumf == cielum | inprims != outprims) |
84 |
|
matscan(scanbuf, scanlen(&inpres), mbcond.cmat); |
85 |
+ |
nread++; |
86 |
|
return(scanbuf); |
87 |
|
} |
88 |
|
|
97 |
|
comprgb2rgbmat(mbcond.cmat, inprims, outprims); |
98 |
|
else |
99 |
|
compxyz2rgbmat(mbcond.cmat, outprims); |
100 |
+ |
if (what2do&DO_ACUITY) |
101 |
+ |
initacuity(); |
102 |
|
scanbuf = (COLOR *)malloc(scanlen(&inpres)*sizeof(COLOR)); |
103 |
|
if (scanbuf == NULL) |
104 |
|
syserror("malloc"); |
105 |
|
nread = 0; |
101 |
– |
#ifdef DEBUG |
102 |
– |
fprintf(stderr, "%s: processing image...", progname); |
103 |
– |
#endif |
106 |
|
return(nextscan()); |
107 |
|
} |
108 |
|
|