| 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 (what2do&DO_ACUITY) |
| 67 |
|
acuscan(scanbuf, nread); |
| 97 |
|
comprgb2rgbmat(mbcond.cmat, inprims, outprims); |
| 98 |
|
else |
| 99 |
|
compxyz2rgbmat(mbcond.cmat, outprims); |
| 100 |
< |
if (what2do&DO_ACUITY) { |
| 100 |
< |
#ifdef DEBUG |
| 101 |
< |
fprintf(stderr, "%s: initializing acuity sampling...", |
| 102 |
< |
progname); |
| 103 |
< |
#endif |
| 100 |
> |
if (what2do&DO_ACUITY) |
| 101 |
|
initacuity(); |
| 105 |
– |
#ifdef DEBUG |
| 106 |
– |
fprintf(stderr, "done\n"); |
| 107 |
– |
#endif |
| 108 |
– |
} |
| 102 |
|
scanbuf = (COLOR *)malloc(scanlen(&inpres)*sizeof(COLOR)); |
| 103 |
|
if (scanbuf == NULL) |
| 104 |
|
syserror("malloc"); |
| 105 |
|
nread = 0; |
| 113 |
– |
#ifdef DEBUG |
| 114 |
– |
fprintf(stderr, "%s: processing image...", progname); |
| 115 |
– |
#endif |
| 106 |
|
return(nextscan()); |
| 107 |
|
} |
| 108 |
|
|
