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.21 by greg, Sat Feb 22 02:07:27 2003 UTC vs.
Revision 2.31 by greg, Fri Sep 3 21:18:15 2010 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id$";
3   #endif
4   /*
5   *  pfilt.c - program to post-process picture file.
# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   *     6/23/93  Added additional buffers for value spreading
9   */
10  
11 < #include  "standard.h"
11 > #include  "copyright.h"
12  
13   #include  <signal.h>
14 + #include  <string.h>
15  
16 + #include  "platform.h"
17 + #include  "standard.h"
18 + #include  "rtio.h"
19   #include  "color.h"
16 –
20   #include  "view.h"
18 –
21   #include  "paths.h"
22 + #include  "pfilt.h"
23  
21 – extern float  *matchlamp();
24  
25   #define  FEQ(a,b)       ((a) >= .98*(b) && (a) <= 1.02*(b))
26  
27 < double   CHECKRAD = 1.5;        /* radius to check for filtering */
27 > double   CHECKRAD = 2.0;        /* radius to check for filtering */
28  
29   #define  THRESHRAD      5.0     /* maximum sample spread in output */
30  
# Line 82 | Line 84 | int  orad = 0;                 /* output window radius */
84  
85   char  *progname;
86  
87 + static gethfunc headline;
88 + static brightfunc_t rgb_bright;
89 + static brightfunc_t xyz_bright;
90 + static void copyfile(FILE  *in, FILE  *out);
91 + static void pass1(FILE  *in);
92 + static void pass2(FILE  *in);
93 + static void scan2init(void);
94 + static void scan2sync(int  r);
95 + static void scan2flush(void);
96  
97 < main(argc, argv)
98 < int  argc;
99 < char  **argv;
97 >
98 > int
99 > main(
100 >        int  argc,
101 >        char  **argv
102 > )
103   {
90 –        extern int  headline();
104          FILE  *fin;
105          float  *lampcolor;
106          char  *lamptype = NULL;
# Line 95 | Line 108 | char  **argv;
108          double  outaspect = 0.0;
109          double  d;
110          int  i, j;
111 < #ifdef MSDOS
112 <        extern int  _fmode;
113 <        _fmode = O_BINARY;
101 <        setmode(fileno(stdin), O_BINARY);
102 <        setmode(fileno(stdout), O_BINARY);
103 < #endif
111 >        SET_DEFAULT_BINARY();
112 >        SET_FILE_BINARY(stdin);
113 >        SET_FILE_BINARY(stdout);
114          if (signal(SIGINT, quit) == SIG_IGN)
115                  signal(SIGINT, SIG_IGN);
116 + #ifdef SIGHUP
117          if (signal(SIGHUP, quit) == SIG_IGN)
118                  signal(SIGHUP, SIG_IGN);
119 + #endif
120          signal(SIGTERM, quit);
121 + #ifdef SIGPIPE
122          signal(SIGPIPE, quit);
123 + #endif
124   #ifdef  SIGXCPU
125          signal(SIGXCPU, quit);
126          signal(SIGXFSZ, quit);
# Line 304 | Line 318 | char  **argv;
318          pass2(fin);
319  
320          quit(estatus);
321 +        return estatus; /* pro forma return */
322   }
323  
324  
325 < double
326 < rgb_bright(clr)
327 < COLOR  clr;
325 > static double
326 > rgb_bright(
327 >        COLOR  clr
328 > )
329   {
330          return(bright(clr));
331   }
332  
333  
334 < double
335 < xyz_bright(clr)
336 < COLOR  clr;
334 > static double
335 > xyz_bright(
336 >        COLOR  clr
337 > )
338   {
339          return(clr[CIEY]);
340   }
341  
342  
343 < double  (*ourbright)() = rgb_bright;
343 > brightfunc_t *ourbright = rgb_bright;
344  
345 <
346 < int
347 < headline(s)                             /* process line from header */
348 < char  *s;
345 > static int
346 > headline(                               /* process line from header */
347 >        char    *s,
348 >        void    *p
349 > )
350   {
351          char  fmt[32];
352  
# Line 351 | Line 369 | char  *s;
369   }
370  
371  
372 < copyfile(in, out)                       /* copy a file */
373 < register FILE  *in, *out;
372 > static void
373 > copyfile(                       /* copy a file */
374 >        register FILE  *in,
375 >        register FILE  *out
376 > )
377   {
378          register int  c;
379  
# Line 366 | Line 387 | register FILE  *in, *out;
387   }
388  
389  
390 < pass1(in)                               /* first pass of picture file */
391 < FILE  *in;
390 > static void
391 > pass1(                          /* first pass of picture file */
392 >        FILE  *in
393 > )
394   {
395          int  i;
396          COLOR  *scan;
# Line 399 | Line 422 | FILE  *in;
422   }
423  
424  
425 < pass2(in)                       /* last pass on file, write to stdout */
426 < FILE  *in;
425 > static void
426 > pass2(                  /* last pass on file, write to stdout */
427 >        FILE  *in
428 > )
429   {
430          int  yread;
431          int  ycent, xcent;
# Line 450 | Line 475 | FILE  *in;
475   }
476  
477  
478 < scan2init()                     /* prepare scanline arrays */
478 > static void
479 > scan2init(void)                 /* prepare scanline arrays */
480   {
481          COLOR   ctmp;
482          double  d;
# Line 488 | Line 514 | scan2init()                    /* prepare scanline arrays */
514          if (obarsize > 0) {
515                  scoutbar = (COLOR **)malloc(obarsize*sizeof(COLOR *));
516                  greybar = (float **)malloc(obarsize*sizeof(float *));
517 <                if (scoutbar == NULL | greybar == NULL)
517 >                if ((scoutbar == NULL) | (greybar == NULL))
518                          goto memerr;
519                  for (i = 0; i < obarsize; i++) {
520                          scoutbar[i] = (COLOR *)malloc(ncols*sizeof(COLOR));
521                          greybar[i] = (float *)malloc(ncols*sizeof(float));
522 <                        if (scoutbar[i] == NULL | greybar[i] == NULL)
522 >                        if ((scoutbar[i] == NULL) | (greybar[i] == NULL))
523                                  goto memerr;
524                  }
525          } else {
# Line 527 | Line 553 | memerr:
553   }
554  
555  
556 < scan2sync(r)                    /* synchronize grey averages and output scan */
557 < int  r;
556 > static void
557 > scan2sync(                      /* synchronize grey averages and output scan */
558 >        int  r
559 > )
560   {
561          static int  nextrow = 0;
562          COLOR  ctmp;
# Line 542 | Line 570 | int  r;
570                          greybar[nextrow%obarsize][c] = (*ourbright)(ctmp);
571                  }
572                                          /* and zero output scanline */
573 <                bzero((char *)scoutbar[nextrow%obarsize], ncols*sizeof(COLOR));
573 >                memset((char *)scoutbar[nextrow%obarsize], '\0', ncols*sizeof(COLOR));
574                  nextrow++;
575          }
576                                          /* point to top scanline for output */
# Line 553 | Line 581 | int  r;
581   }
582  
583  
584 < scan2flush()                    /* flush output buffer */
584 > static void
585 > scan2flush(void)                        /* flush output buffer */
586   {
587          register int  r;
588  

Diff Legend

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