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

Comparing ray/src/px/pcond.c (file contents):
Revision 3.21 by schorsch, Sun Mar 28 20:33:14 2004 UTC vs.
Revision 3.27 by greg, Tue Feb 2 18:02:32 2016 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8  
9   #include "platform.h"
10   #include "paths.h"
11 < #include "rtprocess.h"
11 > #include "paths.h"
12   #include "pcond.h"
13  
14  
# Line 199 | Line 199 | userr:
199   }
200  
201  
202 < extern void
202 > void
203   syserror(                               /* report system error and exit */
204          char    *s
205   )
# Line 260 | Line 260 | getahead(void)                 /* load picture header */
260                                  progname);
261                  exit(1);
262          }
263 <        if (!gotview || ourview.type == VT_PAR) {
263 >        if (!gotview || ourview.type == VT_PAR ||
264 >                        (ourview.horiz <= 5.) | (ourview.vert <= 5.)) {
265                  ourview = stdview;
266                  ourview.type = VT_PER;
267                  if (pixaspect*inpres.yr < inpres.xr) {
# Line 343 | Line 344 | getfovimg(void)                        /* load foveal sampled image */
344          sprintf(combuf, "pfilt -1 -b -pa 0 -x %d -y %d \"%s\"", fvxr, fvyr, infn);
345          if ((fp = popen(combuf, "r")) == NULL)
346                  syserror("popen");
347 +        SET_FILE_BINARY(fp);
348          getheader(fp, NULL, NULL);      /* skip header */
349          if (fgetresolu(&x, &y, fp) < 0 || (x != fvxr) | (y != fvyr))
350                  goto readerr;
# Line 363 | Line 365 | check2do(void)         /* check histogram to see what isn't w
365   {
366          double  sum;
367          double  b, l;
368 <        register int    i;
368 >        int     i;
369  
370                                          /* check for within display range */
371          if (bwmax - bwmin <= Bldmax - Bldmin)

Diff Legend

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