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

Comparing ray/src/cv/pkgBSDF.c (file contents):
Revision 2.4 by greg, Mon Mar 5 00:25:15 2012 UTC vs.
Revision 2.7 by greg, Tue Aug 18 15:23:38 2015 UTC

# Line 87 | Line 87 | cvtBSDF(char *fname)
87   {
88          int     retOK;
89          SDData  myBSDF;
90 <        char    *pname;
90 >        char    *pname, *fnbeg;
91                                          /* find and load the XML file */
92          retOK = strlen(fname);
93 <        if (retOK < 5 || strcmp(fname+retOK-4, ".xml")) {
93 >        if (retOK < 5 || strcasecmp(fname+retOK-4, ".xml")) {
94                  fprintf(stderr, "%s: input does not end in '.xml'\n", fname);
95                  return(0);
96          }
# Line 99 | Line 99 | cvtBSDF(char *fname)
99                  fprintf(stderr, "%s: cannot find BSDF file\n", fname);
100                  return(0);
101          }
102 +        fnbeg = strrchr(fname, DIRSEP);
103 +        if (fnbeg != NULL)              /* eliminate directory */
104 +                fname = fnbeg+1;
105          SDclearBSDF(&myBSDF, fname);
106 <        if (SDreportEnglish(SDloadFile(&myBSDF, pname), stderr))
106 >        if (SDreportError(SDloadFile(&myBSDF, pname), stderr))
107                  return(0);
108          retOK = (myBSDF.dim[0] > FTINY) & (myBSDF.dim[1] > FTINY);
109          if (!retOK) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines