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

Comparing ray/src/px/pcompos.c (file contents):
Revision 2.28 by greg, Mon Mar 15 21:16:54 2004 UTC vs.
Revision 2.29 by schorsch, Sun Mar 28 20:33:14 2004 UTC

# Line 16 | Line 16 | static const char      RCSid[] = "$Id$";
16  
17   #include  "platform.h"
18   #include  "rtprocess.h"
19 + #include  "rterror.h"
20   #include  "color.h"
21   #include  "resolu.h"
22  
# Line 59 | Line 60 | int  nfile;                    /* number of files */
60   char  ourfmt[LPICFMT+1] = PICFMT;
61   int  wrongformat = 0;
62  
62 – FILE  *lblopen();
63 – void  quit();
63  
64   static gethfunc tabputs;
65 + static void compos(void);
66 + static int cmpcolr(COLR  c1, COLR  c2);
67 + static FILE * lblopen(char  *s, int  *xp, int  *yp);
68  
69  
70 +
71   static int
72   tabputs(                        /* print line preceded by a tab */
73          char    *s,
# Line 89 | Line 92 | tabputs(                       /* print line preceded by a tab */
92   }
93  
94  
95 < main(argc, argv)
96 < int  argc;
97 < char  *argv[];
95 > int
96 > main(
97 >        int  argc,
98 >        char  *argv[]
99 > )
100   {
101          int  ncolumns = 0;
102          int  autolabel = 0;
# Line 316 | Line 321 | toomany:
321   labelerr:
322          fprintf(stderr, "%s: error opening label\n", progname);
323          quit(1);
324 +        return 1; /* pro forma return */
325   }
326  
327  
328 < compos()                                /* composite pictures */
328 > static void
329 > compos(void)                            /* composite pictures */
330   {
331          COLR  *scanin, *scanout;
332          int  y;
# Line 385 | Line 392 | memerr:
392   }
393  
394  
395 < int
396 < cmpcolr(c1, c2)                 /* compare two colr's (improvisation) */
397 < register COLR  c1, c2;
395 > static int
396 > cmpcolr(                        /* compare two colr's (improvisation) */
397 >        register COLR  c1,
398 >        register COLR  c2
399 > )
400   {
401          register int  i, j;
402  
# Line 399 | Line 408 | register COLR  c1, c2;
408   }
409  
410  
411 < FILE *
412 < lblopen(s, xp, yp)              /* open pipe to label generator */
413 < char  *s;
414 < int  *xp, *yp;
411 > static FILE *
412 > lblopen(                /* open pipe to label generator */
413 >        char  *s,
414 >        int  *xp,
415 >        int  *yp
416 > )
417   {
418          char  com[PATH_MAX];
419          FILE  *fp;

Diff Legend

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