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

Comparing ray/src/common/bsdf_m.c (file contents):
Revision 3.15 by greg, Wed Apr 27 20:03:25 2011 UTC vs.
Revision 3.17 by greg, Tue Jun 28 21:13:46 2011 UTC

# Line 11 | Line 11 | static const char RCSid[] = "$Id$";
11   *
12   */
13  
14 + #define _USE_MATH_DEFINES
15   #include "rtio.h"
16   #include <stdlib.h>
17   #include <math.h>
# Line 86 | Line 87 | fequal(double a, double b)
87          return (a <= 1e-6) & (a >= -1e-6);
88   }
89  
89 – /* Returns the name of the given tag */
90 – #ifdef ezxml_name
91 – #undef ezxml_name
92 – static char *
93 – ezxml_name(ezxml_t xml)
94 – {
95 –        if (xml == NULL)
96 –                return NULL;
97 –        return xml->name;
98 – }
99 – #endif
100 –
90   /* Returns the given tag's character content or empty string if none */
91   #ifdef ezxml_txt
92   #undef ezxml_txt
# Line 189 | Line 178 | fo_getndx(const FVECT v, void *p)
178   {
179          ANGLE_BASIS     *ab = (ANGLE_BASIS *)p;
180          int     li, ndx;
181 <        double  pol, azi, d;
181 >        double  pol, azi;
182  
183          if (v == NULL)
184                  return -1;
# Line 528 | Line 517 | load_bsdf_data(SDData *sd, ezxml_t wdb, int rowinc)
517                  if (*sdnext == ',') sdnext++;
518                  if (rowinc) {
519                          int     r = i/dp->nout;
520 <                        int     c = i - c*dp->nout;
520 >                        int     c = i - r*dp->nout;
521                          mBSDF_value(dp,r,c) = atof(sdata);
522                  } else
523                          dp->bsdf[i] = atof(sdata);

Diff Legend

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