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

Comparing ray/src/px/pf3.c (file contents):
Revision 2.17 by schorsch, Sun Jul 27 22:12:03 2003 UTC vs.
Revision 2.18 by schorsch, Sun Mar 28 20:33:14 2004 UTC

# Line 12 | Line 12 | static const char RCSid[] = "$Id$";
12   #include  <string.h>
13  
14   #include  "color.h"
15 + #include  "pfilt.h"
16  
17   #define  RSCA           1.13    /* square-radius multiplier: sqrt(4/PI) */
18   #define  TEPS           0.2     /* threshold proximity goal */
19   #define  REPS           0.1     /* radius proximity goal */
20  
20 extern double  CHECKRAD;        /* radius over which gaussian is summed */
21
22 extern double  rad;             /* output pixel radius for filtering */
23
24 extern double  thresh;          /* maximum contribution for subpixel */
25
26 extern int  nrows;              /* number of rows for output */
27 extern int  ncols;              /* number of columns for output */
28
29 extern int  xres, yres;         /* resolution of input */
30
31 extern double  x_c, y_r;        /* conversion factors */
32
33 extern int  xrad;               /* x search radius */
34 extern int  yrad;               /* y search radius */
35 extern int  xbrad;              /* x box size */
36 extern int  ybrad;              /* y box size */
37
38 extern int  barsize;            /* size of input scan bar */
39 extern COLOR  **scanin;         /* input scan bar */
40 extern COLOR  *scanout;         /* output scan line */
41 extern COLOR  **scoutbar;       /* output scan bar (if thresh > 0) */
42 extern float  **greybar;        /* grey-averaged input values */
43 extern int  obarsize;           /* size of output scan bar */
44 extern int  orad;               /* output window radius */
45
46 extern int  wrapfilt;           /* wrap filter horizontally? */
47
48 extern char  *progname;
49
21   float  *gausstable;             /* gauss lookup table */
22  
23   float  *ringsum;                /* sum of ring values */
# Line 54 | Line 25 | short  *ringwt;                        /* weight (count) of ring values */
25   short  *ringndx;                /* ring index table */
26   float  *warr;                   /* array of pixel weights */
27  
57 extern double  (*ourbright)();  /* brightness computation function */
58
59 double  pickfilt();
60
28   #define  lookgauss(x)           gausstable[(int)(10.*(x)+.5)]
29  
30 + static double pickfilt(double  p0);
31 + static void sumans(int  px, int  py, int  rcent, int  ccent, double  m);
32  
33 < initmask()                      /* initialize gaussian lookup table */
33 >
34 > extern void
35 > initmask(void)                  /* initialize gaussian lookup table */
36   {
37          int  gtabsiz;
38          double  gaussN;
# Line 110 | Line 81 | memerr:
81   }
82  
83  
84 < dobox(csum, xcent, ycent, c, r)                 /* simple box filter */
85 < COLOR  csum;
86 < int  xcent, ycent;
87 < int  c, r;
84 > extern void
85 > dobox(                  /* simple box filter */
86 >        COLOR  csum,
87 >        int  xcent,
88 >        int  ycent,
89 >        int  c,
90 >        int  r
91 > )
92   {
93          int  wsum;
94          double  d;
# Line 148 | Line 123 | int  c, r;
123   }
124  
125  
126 < dogauss(csum, xcent, ycent, c, r)               /* gaussian filter */
127 < COLOR  csum;
128 < int  xcent, ycent;
129 < int  c, r;
126 > extern void
127 > dogauss(                /* gaussian filter */
128 >        COLOR  csum,
129 >        int  xcent,
130 >        int  ycent,
131 >        int  c,
132 >        int  r
133 > )
134   {
135          double  dy, dx, weight, wsum;
136          COLOR  ctmp;
# Line 183 | Line 162 | int  c, r;
162   }
163  
164  
165 < dothresh(xcent, ycent, ccent, rcent)    /* gaussian threshold filter */
166 < int  xcent, ycent;
167 < int  ccent, rcent;
165 > extern void
166 > dothresh(       /* gaussian threshold filter */
167 >        int  xcent,
168 >        int  ycent,
169 >        int  ccent,
170 >        int  rcent
171 > )
172   {
173          double  d;
174          int  r, y, offs;
# Line 230 | Line 213 | int  ccent, rcent;
213   }
214  
215  
216 < double
217 < pickfilt(p0)                    /* find filter multiplier for p0 */
218 < double  p0;
216 > static double
217 > pickfilt(                       /* find filter multiplier for p0 */
218 >        double  p0
219 > )
220   {
221          double  m = 1.0;
222          double  t, num, denom, avg, wsum;
# Line 290 | Line 274 | double  p0;
274   }
275  
276  
277 < sumans(px, py, rcent, ccent, m)         /* sum input pixel to output */
278 < int  px, py;
279 < int  rcent, ccent;
280 < double  m;
277 > static void
278 > sumans(         /* sum input pixel to output */
279 >        int  px,
280 >        int  py,
281 >        int  rcent,
282 >        int  ccent,
283 >        double  m
284 > )
285   {
286          double  dy2, dx;
287          COLOR  pval, ctmp;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines