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

Comparing ray/src/px/pfilt.c (file contents):
Revision 2.26 by schorsch, Sun Jul 27 22:12:03 2003 UTC vs.
Revision 2.34 by greg, Sat Dec 28 18:05:14 2019 UTC

# Line 11 | Line 11 | static const char RCSid[] = "$Id$";
11   #include  "copyright.h"
12  
13   #include  <signal.h>
14 #include  <string.h>
14  
16 #include  "standard.h"
15   #include  "platform.h"
16 + #include  "standard.h"
17 + #include  "rtio.h"
18   #include  "color.h"
19   #include  "view.h"
20   #include  "paths.h"
21 + #include  "pfilt.h"
22  
22 extern float  *matchlamp();
23  
24   #define  FEQ(a,b)       ((a) >= .98*(b) && (a) <= 1.02*(b))
25  
# Line 83 | Line 83 | int  orad = 0;                 /* output window radius */
83  
84   char  *progname;
85  
86 + static gethfunc headline;
87 + static brightfunc_t rgb_bright;
88 + static brightfunc_t xyz_bright;
89 + static void copyfile(FILE  *in, FILE  *out);
90 + static void pass1(FILE  *in);
91 + static void pass2(FILE  *in);
92 + static void scan2init(void);
93 + static void scan2sync(int  r);
94 + static void scan2flush(void);
95  
96 < main(argc, argv)
97 < int  argc;
98 < char  **argv;
96 >
97 > int
98 > main(
99 >        int  argc,
100 >        char  **argv
101 > )
102   {
91        extern int  headline();
103          FILE  *fin;
104          float  *lampcolor;
105          char  *lamptype = NULL;
# Line 306 | Line 317 | char  **argv;
317          pass2(fin);
318  
319          quit(estatus);
320 +        return estatus; /* pro forma return */
321   }
322  
323  
324 < double
325 < rgb_bright(clr)
326 < COLOR  clr;
324 > static double
325 > rgb_bright(
326 >        COLOR  clr
327 > )
328   {
329          return(bright(clr));
330   }
331  
332  
333 < double
334 < xyz_bright(clr)
335 < COLOR  clr;
333 > static double
334 > xyz_bright(
335 >        COLOR  clr
336 > )
337   {
338          return(clr[CIEY]);
339   }
340  
341  
342 < double  (*ourbright)() = rgb_bright;
342 > brightfunc_t *ourbright = rgb_bright;
343  
344 <
345 < int
346 < headline(s)                             /* process line from header */
347 < char  *s;
344 > static int
345 > headline(                               /* process line from header */
346 >        char    *s,
347 >        void    *p
348 > )
349   {
350 <        char  fmt[32];
350 >        char  fmt[MAXFMTLEN];
351  
352          fputs(s, stdout);               /* copy to output */
353          if (isaspect(s))                /* get aspect ratio */
# Line 353 | Line 368 | char  *s;
368   }
369  
370  
371 < copyfile(in, out)                       /* copy a file */
372 < register FILE  *in, *out;
371 > static void
372 > copyfile(                       /* copy a file */
373 >        FILE  *in,
374 >        FILE  *out
375 > )
376   {
377 <        register int  c;
377 >        int  c;
378  
379          while ((c = getc(in)) != EOF)
380                  putc(c, out);
# Line 368 | Line 386 | register FILE  *in, *out;
386   }
387  
388  
389 < pass1(in)                               /* first pass of picture file */
390 < FILE  *in;
389 > static void
390 > pass1(                          /* first pass of picture file */
391 >        FILE  *in
392 > )
393   {
394          int  i;
395          COLOR  *scan;
# Line 401 | Line 421 | FILE  *in;
421   }
422  
423  
424 < pass2(in)                       /* last pass on file, write to stdout */
425 < FILE  *in;
424 > static void
425 > pass2(                  /* last pass on file, write to stdout */
426 >        FILE  *in
427 > )
428   {
429          int  yread;
430          int  ycent, xcent;
# Line 452 | Line 474 | FILE  *in;
474   }
475  
476  
477 < scan2init()                     /* prepare scanline arrays */
477 > static void
478 > scan2init(void)                 /* prepare scanline arrays */
479   {
480          COLOR   ctmp;
481          double  d;
482 <        register int  i;
482 >        int  i;
483  
484          xbrad = xres/ncols/2 + 1;
485          ybrad = yres/nrows/2 + 1;
# Line 529 | Line 552 | memerr:
552   }
553  
554  
555 < scan2sync(r)                    /* synchronize grey averages and output scan */
556 < int  r;
555 > static void
556 > scan2sync(                      /* synchronize grey averages and output scan */
557 >        int  r
558 > )
559   {
560          static int  nextrow = 0;
561          COLOR  ctmp;
562          int  ybot;
563 <        register int  c;
563 >        int  c;
564                                          /* average input scanlines */
565          while (nextrow <= r+orad && nextrow < nrows) {
566                  ybot = (nextrow+.5)*yres/nrows;
# Line 555 | Line 580 | int  r;
580   }
581  
582  
583 < scan2flush()                    /* flush output buffer */
583 > static void
584 > scan2flush(void)                        /* flush output buffer */
585   {
586 <        register int  r;
586 >        int  r;
587  
588          for (r = nrows-orad; r < nrows; r++)
589                  if (fwritescan(scoutbar[r%obarsize], ncols, stdout) < 0)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines