36 |
|
setcolor(mp, .0f, .0f, .0f); |
37 |
|
} else if (bsdf->chroma != NULL) { |
38 |
|
C_COLOR cxy; |
39 |
< |
c_decodeChroma(&cxy, |
40 |
< |
bsdf->chroma[r*bsdf->ninc + c]); |
39 |
> |
c_decodeChroma(&cxy, mBSDF_chroma(bsdf,c,r)); |
40 |
|
ccy2rgb(&cxy, f, mp); |
41 |
|
} else |
42 |
|
setcolor(mp, f, f, f); |
102 |
|
setcolor(mp, .0f, .0f, .0f); |
103 |
|
} else if (bsdf->chroma != NULL) { |
104 |
|
C_COLOR cxy; |
105 |
< |
c_decodeChroma(&cxy, |
107 |
< |
bsdf->chroma[ro*bsdf->ninc + ri]); |
105 |
> |
c_decodeChroma(&cxy, mBSDF_chroma(bsdf,ri,ro)); |
106 |
|
ccy2rgb(&cxy, f, mp); |
107 |
|
} else |
108 |
|
setcolor(mp, f, f, f); |
149 |
|
fpath = getpath(fname, getrlibpath(), R_OK); |
150 |
|
if (fpath == NULL) { |
151 |
|
sprintf(errmsg, "cannot find BSDF file '%s'", fname); |
152 |
< |
error(USER, errmsg); |
152 |
> |
error(SYSTEM, errmsg); |
153 |
|
} |
154 |
|
SDclearBSDF(&myBSDF, fname); /* load XML and check type */ |
155 |
|
ec = SDloadFile(&myBSDF, fpath); |