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

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.44 by greg, Tue Dec 9 22:46:41 2003 UTC vs.
Revision 2.47 by greg, Tue Jun 8 19:48:31 2004 UTC

# Line 19 | Line 19 | static const char RCSid[] = "$Id$";
19   #include <ctype.h>
20   #include <sys/stat.h>
21   #include <time.h>
22 + #include <signal.h>
23  
23 – /*#include "standard.h"*/
24   #include "platform.h"
25   #include "paths.h"
26 < #include "rtio.h"
27 < #include "rterror.h"
26 > #include "standard.h"
27   #include "view.h"
28   #include "vars.h"
29   #include "netproc.h"
# Line 140 | Line 139 | static int pruncom(char *com, char *ppins, int maxcopi
139   static void bwait(int ncoms);
140   static int bruncom(char *com, int fout, int (*rf)());
141   static int serverdown(void);
142 < static int donecom(PSERVER *ps, int pn, int status);
142 > static pscompfunc donecom;
143   static int countviews(void);
144   static int dofilt(int frame, int rvr);
145   static void archive(void);
# Line 157 | Line 156 | static void setdefaults(void);
156   static void putastat(void);
157  
158  
159 < main(argc, argv)
160 < int     argc;
161 < char    *argv[];
159 > int
160 > main(
161 >        int     argc,
162 >        char    *argv[]
163 > )
164   {
165          int     explicate = 0;
166          int     i;
# Line 222 | Line 223 | char   *argv[];
223                  quit(1);
224          }
225          quit(0);
226 +        return 0; /* pro forma return */
227   userr:
228          fprintf(stderr, "Usage: %s [-s][-n][-w][-e] anim_file\n", progname);
229          quit(1);
230 +        return 1; /* pro forma return */
231   }
232  
233  
# Line 491 | Line 494 | getradfile(char *rfargs)               /* run rad and get needed va
494          char    combuf[256];
495          register int    i;
496          register char   *cp;
497 <        char    *pippt;
497 >        char    *pippt = NULL;
498                                          /* create rad command */
499          sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY));
500          sprintf(combuf,
# Line 655 | Line 658 | renderframes(int nframes)              /* render next nframes fram
658   static void
659   filterframes(void)                              /* catch up with filtering */
660   {
658 –        VIEW    *vp;
661          register int    i;
662  
663          if (astat.tnext < astat.fnext)  /* other work to do first */
# Line 915 | Line 917 | int    rvr
917                                            progname, frame);
918                  quit(1);
919          }
918 –        if (ep == NULL) {
919 –                 fprintf(stderr,
920 –                        "%s: unexpected error reading exposure for frame %d\n",
921 –                                          progname, frame);
922 –                quit(1);
923 –        }
920          usepinterp = (nblur > 1);
921          usepfilt = pfiltalways | (ep==NULL);
922          if (ep != NULL && !strcmp(ep, "1"))
# Line 1205 | Line 1201 | findpslot(int pid)                     /* find or allocate a process slo
1201  
1202   static int
1203   donecom(                /* clean up after finished process */
1204 < PSERVER *ps,
1205 < int     pn,
1206 < int     status
1204 >        PSERVER *ps,
1205 >        int     pn,
1206 >        int     status
1207   )
1208   {
1209          register NETPROC        *pp;

Diff Legend

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