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

Comparing ray/src/px/pf2.c (file contents):
Revision 2.6 by greg, Sat Feb 22 02:07:27 2003 UTC vs.
Revision 2.7 by schorsch, Sun Mar 28 20:33:14 2004 UTC

# Line 6 | Line 6 | static const char      RCSid[] = "$Id$";
6   */
7  
8   #include  <stdio.h>
9 –
9   #include  <stdlib.h>
11 –
10   #include  <math.h>
11  
12 + #include  "rterror.h"
13   #include  "random.h"
15 –
14   #include  "color.h"
15 + #include  "pfilt.h"
16  
17   #define  PI             3.14159265359
19 –
18   #define  FTINY          (1e-6)
19  
22 – extern int  nrows, ncols;       /* number of rows and columns for output */
23 –
24 – extern int  xres, yres;         /* x and y resolution */
25 –
26 – extern int  avghot;             /* true means average in avgbrt spots */
27 –
28 – extern double  hotlvl;          /* brightness considered "hot" */
29 –
30 – extern int  npts;               /* # of points for stars */
31 –
32 – extern double  spread;          /* spread for star points */
33 –
34 – extern char  *progname;
35 –
36 – extern COLOR  exposure;         /* exposure for frame */
37 –
38 – extern double  (*ourbright)();  /* brightness calculation function */
39 –
20   #define  AVGLVL         0.5     /* target mean brightness */
21  
22   double  avgbrt;                 /* average picture brightness */
# Line 53 | Line 33 | HOTPIX *head;                  /* head of avgbrt pixel list */
33  
34   double  sprdfact;               /* computed spread factor */
35  
36 + static void starpoint(COLOR  fcol, int  x, int  y, HOTPIX        *hp);
37  
38 < pass1init()                     /* prepare for first pass */
38 >
39 > extern void
40 > pass1init(void)                 /* prepare for first pass */
41   {
42          avgbrt = 0.0;
43          npix = 0;
# Line 62 | Line 45 | pass1init()                    /* prepare for first pass */
45   }
46  
47  
48 < pass1default()                  /* for single pass */
48 > extern void
49 > pass1default(void)                      /* for single pass */
50   {
51          avgbrt = AVGLVL;
52          npix = 1;
# Line 70 | Line 54 | pass1default()                 /* for single pass */
54   }
55  
56  
57 < pass1scan(scan, y)              /* process first pass scanline */
58 < register COLOR  *scan;
59 < int  y;
57 > extern void
58 > pass1scan(              /* process first pass scanline */
59 >        register COLOR  *scan,
60 >        int  y
61 > )
62   {
63          double  cbrt;
64          register int  x;
# Line 107 | Line 93 | int  y;
93   }
94  
95  
96 < pass2init()                     /* prepare for final pass */
96 > extern void
97 > pass2init(void)                 /* prepare for final pass */
98   {
99          if (!npix) {
100                  fprintf(stderr, "%s: picture too dark or too bright\n",
# Line 123 | Line 110 | pass2init()                    /* prepare for final pass */
110   }
111  
112  
113 < pass2scan(scan, y)              /* process final pass scanline */
114 < register COLOR  *scan;
115 < int  y;
113 > extern void
114 > pass2scan(              /* process final pass scanline */
115 >        register COLOR  *scan,
116 >        int  y
117 > )
118   {
119          int  xmin, xmax;
120          register int  x;
# Line 157 | Line 146 | int  y;
146   }
147  
148  
149 < starpoint(fcol, x, y, hp)               /* pixel is on the star's point */
150 < COLOR  fcol;
151 < int  x, y;
152 < register HOTPIX  *hp;
149 > static void
150 > starpoint(              /* pixel is on the star's point */
151 >        COLOR  fcol,
152 >        int  x,
153 >        int  y,
154 >        register HOTPIX  *hp
155 > )
156   {
157          COLOR  ctmp;
158          double  d2;

Diff Legend

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