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

Comparing ray/src/px/pcomb.c (file contents):
Revision 2.24 by schorsch, Sun Jun 8 12:03:10 2003 UTC vs.
Revision 2.30 by schorsch, Fri Jan 2 12:47:01 2004 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *      1/4/89
8   */
9  
10 – #include "standard.h"
10   #include "platform.h"
11 + #include "rtprocess.h"
12 + #include "rterror.h"
13   #include "color.h"
14   #include "calcomp.h"
15   #include "view.h"
# Line 69 | Line 70 | char   *progname;                      /* global argv[0] */
70   int     wrongformat = 0;
71   int     gotview;
72  
72 – FILE    *popen();
73  
74   extern char     *emalloc();
75  
76 + static gethfunc tabputs;
77  
78   main(argc, argv)
79   int     argc;
# Line 109 | Line 110 | char   *argv[];
110          for (nfiles = 0; nfiles < MAXINP; nfiles++) {
111                  setcolor(input[nfiles].coef, 1.0, 1.0, 1.0);
112                  setcolor(input[nfiles].expos, 1.0, 1.0, 1.0);
113 <                copystruct(&input[nfiles].vw, &stdview);
113 >                input[nfiles].vw = stdview;
114                  input[nfiles].pa = 1.0;
115          }
116          nfiles = 0;
# Line 219 | Line 220 | usage:
220   }
221  
222  
223 < tabputs(s)                      /* put out string preceded by a tab */
224 < char    *s;
223 > static int
224 > tabputs(                        /* put out string preceded by a tab */
225 >        char    *s,
226 >        void    *p
227 > )
228   {
229          char    fmt[32];
230          double  d;
# Line 312 | Line 316 | double (*ourbright)() = rgb_bright;
316  
317   init()                                  /* perform final setup */
318   {
319 <        double  l_colin(), l_expos(), l_pixaspect(), l_ray(), l_psize();
319 >        double  l_colin(char *), l_expos(char *), l_pixaspect(char *),
320 >                        l_ray(char *), l_psize(char *);
321          register int    i;
322                                                  /* define constants */
323          varset("PI", ':', PI);
# Line 446 | Line 451 | register char  *nam;
451  
452  
453   double
454 < l_pixaspect()                   /* return pixel aspect ratio */
454 > l_pixaspect(char *nm)           /* return pixel aspect ratio */
455   {
456          register int    fn;
457  
# Line 518 | Line 523 | register char  *nam;
523          static unsigned long    ltick[MAXINP];
524          static FVECT    lorg[MAXINP], ldir[MAXINP];
525          static double   ldist[MAXINP];
526 <        FLOAT   loc[2];
526 >        RREAL   loc[2];
527          int     fn;
528          register int    i;
529  
# Line 551 | Line 556 | register char  *nam;
556  
557  
558   double
559 < l_psize()                       /* compute pixel size in steradians */
559 > l_psize(char *nm)               /* compute pixel size in steradians */
560   {
561          static unsigned long    ltick[MAXINP];
562          static double   psize[MAXINP];
563          FVECT   dir0, org, dirx, diry;
564 <        FLOAT   locx[2], locy[2];
564 >        RREAL   locx[2], locy[2];
565          double  d;
566          int     fn;
567          register int    i;
# Line 596 | Line 601 | l_psize()                      /* compute pixel size in steradians */
601   }
602  
603  
604 < void
605 < wputs(msg)
601 < char    *msg;
604 > extern void
605 > wputs(char      *msg)
606   {
607          if (!nowarn)
608                  eputs(msg);
609   }
610  
611  
612 < void
613 < eputs(msg)
610 < char    *msg;
612 > extern void
613 > eputs(char *msg)
614   {
615          fputs(msg, stderr);
616   }
617  
618  
619 < void
620 < quit(code)              /* exit gracefully */
618 < int  code;
619 > extern void
620 > quit(int code)          /* exit gracefully */
621   {
622          register int  i;
623                                  /* close input files */

Diff Legend

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