ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/cmbsdf.c
(Generate patch)

Comparing ray/src/util/cmbsdf.c (file contents):
Revision 2.5 by greg, Tue Mar 22 03:56:17 2016 UTC vs.
Revision 2.6 by greg, Wed Jul 31 22:00:08 2019 UTC

# Line 139 | Line 139 | CMATRIX *
139   cm_loadBTDF(char *fname)
140   {
141          CMATRIX         *Tmat;
142        char            *fpath;
142          int             recip;
143          SDError         ec;
144          SDData          myBSDF;
145          SDSpectralDF    *tdf;
146          COLOR           diffBSDF;
147 <                                        /* find path to BSDF file */
149 <        fpath = getpath(fname, getrlibpath(), R_OK);
150 <        if (fpath == NULL) {
151 <                sprintf(errmsg, "cannot find BSDF file '%s'", fname);
152 <                error(SYSTEM, errmsg);
153 <        }
147 >
148          SDclearBSDF(&myBSDF, fname);    /* load XML and check type */
149 <        ec = SDloadFile(&myBSDF, fpath);
149 >        ec = SDloadFile(&myBSDF, fname);
150          if (ec)
151                  error(USER, transSDError(ec));
152          ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, diffBSDF);
# Line 163 | Line 157 | cm_loadBTDF(char *fname)
157                  return(cm_bsdf_Lamb(diffBSDF));
158          }
159          if (tdf->ncomp != 1 || tdf->comp[0].func != &SDhandleMtx) {
160 <                sprintf(errmsg, "unsupported BSDF '%s'", fpath);
160 >                sprintf(errmsg, "unsupported BSDF '%s'", fname);
161                  error(USER, errmsg);
162          }
163                                          /* convert BTDF to matrix */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines