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

Comparing ray/src/common/calfunc.c (file contents):
Revision 2.22 by greg, Mon Jun 10 16:52:27 2019 UTC vs.
Revision 2.25 by greg, Thu Nov 7 23:19:54 2019 UTC

# Line 150 | Line 150 | funset(                                /* set a library function */
150          if (cp == fname) return;
151      }
152      if ((lp = liblookup(fname)) == NULL) {      /* insert */
153 +        if (fptr == NULL)
154 +                return;                         /* nothing! */
155          if (libsize >= MAXLIB) {
156              eputs("Too many library functons!\n");
157              quit(1);
# Line 390 | Line 392 | l_if(char *nm)         /* if(cond, then, else) conditional ex
392   static double
393   l_select(char *nm)      /* return argument #(A1+1) */
394   {
395 <        int  n;
395 >        int     narg = nargum();
396 >        double  a1 = argument(1);
397 >        int  n = (int)(a1 + .5);
398  
399 <        n = (int)(argument(1) + .5);
396 <        if (n == 0)
397 <                return(nargum()-1);
398 <        if (n < 1 || n > nargum()-1) {
399 >        if (a1 < -.5 || n >= narg) {
400                  errno = EDOM;
401                  return(0.0);
402          }
403 +        if (!n)         /* asking max index? */
404 +                return(narg-1);
405          return(argument(n+1));
406   }
407  
# Line 408 | Line 411 | l_max(char *nm)                /* general maximum function */
411   {
412          int  n = nargum();
413          int  i = 1;
414 <        int  vmax = argument(1);
414 >        double  vmax = argument(1);
415  
416          while (i++ < n) {
417                  double  v = argument(i);
# Line 424 | Line 427 | l_min(char *nm)                /* general minimum function */
427   {
428          int  n = nargum();
429          int  i = 1;
430 <        int  vmin = argument(1);
430 >        double  vmin = argument(1);
431  
432          while (i++ < n) {
433                  double  v = argument(i);

Diff Legend

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