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

Comparing ray/src/util/rpiece.c (file contents):
Revision 2.39 by schorsch, Thu Jun 26 00:58:11 2003 UTC vs.
Revision 2.44 by greg, Tue Jun 8 19:48:31 2004 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Generate sections of a picture.
6   */
7  
8 +
9 + #include <stdio.h>
10 + #include <signal.h>
11 + #include <sys/types.h>
12 + #include <sys/wait.h>
13 +
14 + #include "platform.h"
15   #include "standard.h"
16 + #include "color.h"
17 + #include "view.h"
18 + #include "rtprocess.h"
19  
20   #ifndef F_SETLKW
21  
22 < main(argc, argv)
23 < int argc;
24 < char *argv[];
22 > int
23 > main(
24 >        int argc,
25 >        char *argv[]
26 > )
27   {
28          fprintf(stderr, "%s: no NFS lock manager on this machine\n", argv[0]);
29          exit(1);
# Line 19 | Line 31 | char *argv[];
31  
32   #else
33  
22 – #include <signal.h>
23 –
24 – #include "color.h"
25 – #include "view.h"
26 – #include "rtprocess.h"
27 –
34   #ifndef NFS
35   #define  NFS                    1
36   #endif
# Line 42 | Line 48 | char *argv[];
48   #define unguard()       sigrelse(SIGALRM)
49   #endif
50   #ifndef guard_io
51 < #define guard_io()      0
52 < #define unguard()       0
51 > #define guard_io()      
52 > #define unguard()      
53   #endif
54  
55   extern char  *strerror();
# Line 75 | Line 81 | int  rvrlim = -1;
81   int  gotalrm = 0;
82   void  onalrm(int i) { gotalrm++; }
83  
84 + static void dolock(int  fd, int  ltyp);
85 + static void init(int  ac, char  **av);
86 + static int nextpiece(int        *xp, int        *yp);
87 + static int rvrpiece(int *xp, int        *yp);
88 + static int cleanup(int  rstat);
89 + static void rpiece(void);
90 + static int putpiece(int xpos, int       ypos);
91 + static void filerr(char  *t);
92  
93 < main(argc, argv)
94 < int  argc;
95 < char  *argv[];
93 >
94 > int
95 > main(
96 >        int  argc,
97 >        char  *argv[]
98 > )
99   {
100          register int  i, rval;
101          
# Line 187 | Line 204 | char  *argv[];
204   }
205  
206  
207 < dolock(fd, ltyp)                /* lock or unlock a file */
208 < int  fd;
209 < int  ltyp;
207 > static void
208 > dolock(         /* lock or unlock a file */
209 >        int  fd,
210 >        int  ltyp
211 > )
212   {
213          static struct flock  fls;       /* static so initialized to zeroes */
214  
# Line 202 | Line 221 | int  ltyp;
221   }
222  
223  
224 < init(ac, av)                    /* set up output file and start rpict */
225 < int  ac;
226 < char  **av;
224 > static void
225 > init(                   /* set up output file and start rpict */
226 >        int  ac,
227 >        char  **av
228 > )
229   {
230          static char  hrbuf[16], vrbuf[16];
231          extern char  VersionID[];
# Line 294 | Line 315 | filerr:
315   }
316  
317  
318 < int
319 < nextpiece(xp, yp)               /* get next piece assignment */
320 < int  *xp, *yp;
318 > static int
319 > nextpiece(              /* get next piece assignment */
320 >        int     *xp,
321 >        int     *yp
322 > )
323   {
324          if (gotalrm)                    /* someone wants us to quit */
325                  return(0);
# Line 336 | Line 359 | int  *xp, *yp;
359   }
360  
361  
362 < int
363 < rvrpiece(xp, yp)                /* check for recoverable pieces */
364 < register int  *xp, *yp;
362 > static int
363 > rvrpiece(               /* check for recoverable pieces */
364 >        register int    *xp,
365 >        register int    *yp
366 > )
367   {
368          static char  *pdone = NULL;     /* which pieces are done */
369          static long  readpos = -1;      /* how far we've read */
# Line 380 | Line 405 | register int  *xp, *yp;
405   }
406  
407  
408 < int
409 < cleanup(rstat)                  /* close rpict process and clean up */
410 < int  rstat;
408 > static int
409 > cleanup(                        /* close rpict process and clean up */
410 >        int  rstat
411 > )
412   {
413          int  status;
414  
# Line 396 | Line 422 | int  rstat;
422   }
423  
424  
425 < rpiece()                        /* render picture piece by piece */
425 > static void
426 > rpiece(void)                    /* render picture piece by piece */
427   {
428          VIEW  pview;
429          int  xorg, yorg;
430                                          /* compute view parameters */
431 <        copystruct(&pview, &ourview);
431 >        pview = ourview;
432          switch (ourview.type) {
433          case VT_PER:
434                  pview.horiz = 2.*180./PI*atan(
# Line 443 | Line 470 | rpiece()                       /* render picture piece by piece */
470   }
471  
472  
473 < int
474 < putpiece(xpos, ypos)            /* get next piece from rpict */
475 < int  xpos, ypos;
473 > static int
474 > putpiece(               /* get next piece from rpict */
475 > int     xpos,
476 > int     ypos
477 > )
478   {
479          struct flock  fls;
480          int  pid, status;
481          int  hr, vr;
482          register int  y;
483                                  /* check bounds */
484 <        if (xpos < 0 | ypos < 0 | xpos >= hmult | ypos >= vmult) {
484 >        if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) {
485                  fprintf(stderr, "%s: requested piece (%d,%d) out of range\n",
486                                  progname, xpos, ypos);
487                  exit(cleanup(1));
# Line 460 | Line 489 | int  xpos, ypos;
489                                  /* check header from rpict */
490          guard_io();
491          getheader(fromrp, NULL, NULL);
492 <        if (!fscnresolu(&hr, &vr, fromrp) || hr != hres | vr != vres) {
492 >        if (!fscnresolu(&hr, &vr, fromrp) || (hr != hres) | (vr != vres)) {
493                  fprintf(stderr, "%s: resolution mismatch from %s\n",
494                                  progname, rpargv[0]);
495                  exit(cleanup(1));
# Line 505 | Line 534 | int  xpos, ypos;
534                  filerr("lock");
535   #endif
536                                  /* write new piece to file */
537 <        if (lseek(outfd, (off_t)fls.l_start, 0) < 0)
537 >        if (lseek(outfd, (off_t)fls.l_start, SEEK_SET) < 0)
538                  filerr("seek");
539          if (hmult == 1) {
540                  if (writebuf(outfd, (char *)pbuf,
# Line 518 | Line 547 | int  xpos, ypos;
547                                  filerr("write");
548                          if (y < vr-1 && lseek(outfd,
549                                          (off_t)(hmult-1)*hr*sizeof(COLR),
550 <                                        1) < 0)
550 >                                        SEEK_CUR) < 0)
551                                  filerr("seek");
552                  }
553   #if NFS
# Line 544 | Line 573 | int  xpos, ypos;
573   }
574  
575  
576 < filerr(t)                       /* report file error and exit */
577 < char  *t;
576 > static void
577 > filerr(                 /* report file error and exit */
578 >        char  *t
579 > )
580   {
581          fprintf(stderr, "%s: %s error on file \"%s\": %s\n",
582                          progname, t, outfile, strerror(errno));

Diff Legend

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