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

Comparing ray/src/util/rsensor.c (file contents):
Revision 2.17 by greg, Fri Apr 24 19:17:12 2015 UTC vs.
Revision 2.20 by greg, Fri Jul 24 17:09:33 2020 UTC

# Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9   */
10  
11   #include "ray.h"
12 + #include "platform.h"
13   #include "source.h"
14   #include "view.h"
15   #include "random.h"
# Line 77 | Line 78 | quit(ec)                       /* make sure exit is called */
78   int     ec;
79   {
80          if (ray_pnprocs > 0)    /* close children if any */
81 <                ray_pclose(0);          
81 >                ray_pclose(0);
82 >        else if (ray_pnprocs < 0)
83 >                _exit(ec);      /* avoid flush in child */
84          exit(ec);
85   }
86  
# Line 237 | Line 240 | load_sensor(
240                  cp = fskip(cp);
241                  if (cp == NULL)
242                          break;
243 <                if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]) {
243 >                if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]+FTINY) {
244                          sprintf(errmsg,
245                  "Phi values not monotinically increasing in sensor file '%s'",
246                                          sfile);
# Line 303 | Line 306 | load_sensor(
306          else if (fabs(sarr[1]) > FTINY)
307                  sprintf(errmsg, "minimum phi must be 0 in sensor file '%s'",
308                                  sfile);
309 <        else if (sarr[ntp[1]] <= FTINY)
309 >        else if (sarr[ntp[1]] < 270.-FTINY)
310                  sprintf(errmsg,
311 <                        "maximum phi must be positive in sensor file '%s'",
311 >                        "maximum phi must be 270 or greater in sensor file '%s'",
312 >                                sfile);
313 >        else if (sarr[ntp[1]] >= 360.-FTINY)
314 >                sprintf(errmsg,
315 >                        "maximum phi must be less than 360 in sensor file '%s'",
316                                  sfile);
317          if (errmsg[0])
318                  error(USER, errmsg);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines