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.17 by schorsch, Sun Jul 27 22:12:03 2003 UTC vs.
Revision 3.20 by schorsch, Fri Jan 2 12:47:01 2004 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   */
8  
9   #include "platform.h"
10 + #include "paths.h"
11 + #include "rtprocess.h"
12   #include "pcond.h"
13  
14  
# Line 42 | Line 44 | double bwavg;                          /* mean brightness */
44  
45   double  scalef = 0.;                    /* linear scaling factor */
46  
47 + static gethfunc headline;
48  
49 +
50   main(argc, argv)
51   int     argc;
52   char    *argv[];
# Line 196 | Line 200 | char   *s;
200   }
201  
202  
203 < headline(s)                             /* process header line */
204 < char    *s;
203 > static int
204 > headline(                               /* process header line */
205 >        char    *s,
206 >        void    *p
207 > )
208   {
209          static RGBPRIMS inprimS;
210          char    fmt[32];
# Line 305 | Line 312 | mapimage()                             /* map picture and send to stdout */
312  
313   getfovimg()                     /* load foveal sampled image */
314   {
315 <        extern FILE     *popen();
309 <        char    combuf[128];
315 >        char    combuf[PATH_MAX];
316          FILE    *fp;
317          int     x, y;
318                                                  /* compute image size */
# Line 321 | Line 327 | getfovimg()                    /* load foveal sampled image */
327          }
328          if ((fovimg = (COLOR *)malloc(fvxr*fvyr*sizeof(COLOR))) == NULL)
329                  syserror("malloc");
330 <        sprintf(combuf, "pfilt -1 -b -pa 0 -x %d -y %d %s", fvxr, fvyr, infn);
330 >        sprintf(combuf, "pfilt -1 -b -pa 0 -x %d -y %d \"%s\"", fvxr, fvyr, infn);
331          if ((fp = popen(combuf, "r")) == NULL)
332                  syserror("popen");
333          getheader(fp, NULL, NULL);      /* skip header */

Diff Legend

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