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.25 by schorsch, Mon Jun 30 14:59:12 2003 UTC vs.
Revision 2.33 by greg, Thu Aug 2 18:33:44 2018 UTC

# Line 13 | Line 13 | static const char RCSid[] = "$Id$";
13   #include  <signal.h>
14   #include  <string.h>
15  
16 #include  "standard.h"
16   #include  "platform.h"
17 + #include  "standard.h"
18 + #include  "rtio.h"
19   #include  "color.h"
20   #include  "view.h"
21   #include  "paths.h"
22 + #include  "pfilt.h"
23  
22 extern float  *matchlamp();
24  
25   #define  FEQ(a,b)       ((a) >= .98*(b) && (a) <= 1.02*(b))
26  
# Line 83 | 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   {
91        extern int  headline();
104          FILE  *fin;
105          float  *lampcolor;
106          char  *lamptype = NULL;
# Line 306 | 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];
351 >        char  fmt[MAXFMTLEN];
352  
353          fputs(s, stdout);               /* copy to output */
354          if (isaspect(s))                /* get aspect ratio */
# Line 353 | 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 >        FILE  *in,
375 >        FILE  *out
376 > )
377   {
378 <        register int  c;
378 >        int  c;
379  
380          while ((c = getc(in)) != EOF)
381                  putc(c, out);
# Line 368 | 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 401 | 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 452 | 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;
483 <        register int  i;
483 >        int  i;
484  
485          xbrad = xres/ncols/2 + 1;
486          ybrad = yres/nrows/2 + 1;
# Line 490 | 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 529 | 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;
563          int  ybot;
564 <        register int  c;
564 >        int  c;
565                                          /* average input scanlines */
566          while (nextrow <= r+orad && nextrow < nrows) {
567                  ybot = (nextrow+.5)*yres/nrows;
# Line 555 | 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;
587 >        int  r;
588  
589          for (r = nrows-orad; r < nrows; r++)
590                  if (fwritescan(scoutbar[r%obarsize], ncols, stdout) < 0)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines