[ViewVC] Diff of: radiance/src/util/ranimate.c

Comparing src/util/ranimate.c (file contents):
Revision 2.17 by greg, Wed Jul 3 15:26:44 1996 UTC vs.
Revision 2.56 by schorsch, Sun Mar 6 01:13:18 2016 UTC

#	Line 1 \| Line 1
1	–	/* Copyright (c) 1996 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* Radiance animation control program
6	+	*
7	+	* The main difference between this program and ranimove is that
8	+	* we have many optimizations here for camera motion in static
9	+	* environments, calling rpict and pinterp on multiple processors,
10	+	* where ranimove puts its emphasis on object motion, and does
11	+	* not use any external programs for image generation.
12	+	*
13	+	* See the ranimate(1) man page for further details.
14		*/
15
16	<	#include "standard.h"
16	>	#include "copyright.h"
17	>
18	>	#include <stdio.h>
19		#include <ctype.h>
13	–	#include <sys/types.h>
20		#include <sys/stat.h>
21	+	#include <time.h>
22	+	#include <signal.h>
23	+
24	+	#include "platform.h"
25	+	#include "rtprocess.h"
26	+	#include "paths.h"
27	+	#include "standard.h"
28		#include "view.h"
29		#include "vars.h"
30		#include "netproc.h"
31	+	/* default blur samples */
32	+	#ifndef DEF_NBLUR
33	+	#define DEF_NBLUR 5
34	+	#endif
35		/* default remote shell */
36	<	#ifdef _AUX_SOURCE
37	<	#define REMSH "remsh"
21	<	#else
22	<	#define REMSH "rsh"
36	>	#ifndef REMSH
37	>	#define REMSH "ssh"
38		#endif
39	<	/* input variables */
40	<	#define HOST 0 /* rendering host machine */
41	<	#define RENDER 1 /* rendering options */
42	<	#define PFILT 2 /* pfilt options */
43	<	#define PINTERP 3 /* pinterp options */
44	<	#define OCTREE 4 /* octree file name */
45	<	#define DIRECTORY 5 /* working (sub)directory */
46	<	#define BASENAME 6 /* output image base name */
47	<	#define VIEWFILE 7 /* animation frame views */
48	<	#define START 8 /* starting frame number */
49	<	#define END 9 /* ending frame number */
50	<	#define RIF 10 /* rad input file */
39	>	/* input variables (alphabetical by name) */
40	>	#define ANIMATE 0 /* animation command */
41	>	#define ARCHIVE 1 /* archiving command */
42	>	#define BASENAME 2 /* output image base name */
43	>	#define DBLUR 3 /* depth of field blur */
44	>	#define DIRECTORY 4 /* working (sub)directory */
45	>	#define DISKSPACE 5 /* how much disk space to use */
46	>	#define END 6 /* ending frame number */
47	>	#define EXPOSURE 7 /* how to compute exposure */
48	>	#define HOST 8 /* rendering host machine */
49	>	#define INTERP 9 /* # frames to interpolate */
50	>	#define MBLUR 10 /* motion blur parameters */
51		#define NEXTANIM 11 /* next animation file */
52	<	#define ANIMATE 12 /* animation command */
53	<	#define TRANSFER 13 /* frame transfer command */
54	<	#define ARCHIVE 14 /* archiving command */
55	<	#define INTERP 15 /* # frames to interpolate */
56	<	#define OVERSAMP 16 /* # times to oversample image */
57	<	#define MBLUR 17 /* samples for motion blur */
58	<	#define RTRACE 18 /* use rtrace with pinterp? */
59	<	#define DISKSPACE 19 /* how much disk space to use */
60	<	#define RESOLUTION 20 /* desired final resolution */
61	<	#define EXPOSURE 21 /* how to compute exposure */
62	<	#define RSH 22 /* remote shell script or program */
52	>	#define OCTREE 12 /* octree file name */
53	>	#define OVERSAMP 13 /* # times to oversample image */
54	>	#define PFILT 14 /* pfilt options */
55	>	#define PINTERP 15 /* pinterp options */
56	>	#define RENDER 16 /* rendering options */
57	>	#define RESOLUTION 17 /* desired final resolution */
58	>	#define RIF 18 /* rad input file */
59	>	#define RSH 19 /* remote shell script or program */
60	>	#define RTRACE 20 /* use rtrace with pinterp? */
61	>	#define START 21 /* starting frame number */
62	>	#define TRANSFER 22 /* frame transfer command */
63	>	#define VIEWFILE 23 /* animation frame views */
64
65	<	int NVARS = 23; /* total number of variables */
65	>	int NVARS = 24; /* total number of variables */
66
67		VARIABLE vv[] = { /* variable-value pairs */
52	–	{"host", 4, 0, NULL, NULL},
53	–	{"render", 3, 0, NULL, catvalues},
54	–	{"pfilt", 2, 0, NULL, catvalues},
55	–	{"pinterp", 2, 0, NULL, catvalues},
56	–	{"OCTREE", 3, 0, NULL, onevalue},
57	–	{"DIRECTORY", 3, 0, NULL, onevalue},
58	–	{"BASENAME", 3, 0, NULL, onevalue},
59	–	{"VIEWFILE", 2, 0, NULL, onevalue},
60	–	{"START", 2, 0, NULL, intvalue},
61	–	{"END", 2, 0, NULL, intvalue},
62	–	{"RIF", 3, 0, NULL, onevalue},
63	–	{"NEXTANIM", 3, 0, NULL, onevalue},
68		{"ANIMATE", 2, 0, NULL, onevalue},
65	–	{"TRANSFER", 2, 0, NULL, onevalue},
69		{"ARCHIVE", 2, 0, NULL, onevalue},
70	+	{"BASENAME", 3, 0, NULL, onevalue},
71	+	{"DBLUR", 2, 0, NULL, onevalue},
72	+	{"DIRECTORY", 3, 0, NULL, onevalue},
73	+	{"DISKSPACE", 3, 0, NULL, fltvalue},
74	+	{"END", 2, 0, NULL, intvalue},
75	+	{"EXPOSURE", 3, 0, NULL, onevalue},
76	+	{"host", 4, 0, NULL, NULL},
77		{"INTERPOLATE", 3, 0, NULL, intvalue},
68	–	{"OVERSAMPLE", 2, 0, NULL, fltvalue},
78		{"MBLUR", 2, 0, NULL, onevalue},
79	<	{"RTRACE", 2, 0, NULL, boolvalue},
80	<	{"DISKSPACE", 3, 0, NULL, fltvalue},
79	>	{"NEXTANIM", 3, 0, NULL, onevalue},
80	>	{"OCTREE", 3, 0, NULL, onevalue},
81	>	{"OVERSAMPLE", 2, 0, NULL, fltvalue},
82	>	{"pfilt", 2, 0, NULL, catvalues},
83	>	{"pinterp", 2, 0, NULL, catvalues},
84	>	{"render", 3, 0, NULL, catvalues},
85		{"RESOLUTION", 3, 0, NULL, onevalue},
86	<	{"EXPOSURE", 3, 0, NULL, onevalue},
86	>	{"RIF", 3, 0, NULL, onevalue},
87		{"RSH", 3, 0, NULL, onevalue},
88	+	{"RTRACE", 2, 0, NULL, boolvalue},
89	+	{"START", 2, 0, NULL, intvalue},
90	+	{"TRANSFER", 2, 0, NULL, onevalue},
91	+	{"VIEWFILE", 2, 0, NULL, onevalue},
92		};
93
94		#define SFNAME "STATUS" /* status file name */
95
96		struct {
97		char host[64]; /* control host name */
98	<	int pid; /* control process id */
98	>	RT_PID pid; /* control process id */
99		char cfname[128]; /* control file name */
100		int rnext; /* next frame to render */
101		int fnext; /* next frame to filter */
#	Line 93 \| Line 110 \| *int silent = 0; / silent mode? /*
110		int noaction = 0; /* take no action? */
111
112		char remsh; / remote shell program/script */
113	<	char rendopt[2048] = ""; /* rendering options */
113	>	char rendopt[2048]; /* rendering options */
114		char rresopt[32]; /* rendering resolution options */
115		char fresopt[32]; /* filter resolution options */
116		int pfiltalways; /* always use pfilt? */
#	Line 102 \| Line 119 \| *char arcargs[10240]; / files to archive /*
119		char arcfirst, arcnext; /* pointers to first and next argument */
120
121		struct pslot {
122	<	int pid; /* process ID (0 if empty) */
122	>	RT_PID pid; /* process ID (0 if empty) */
123		int fout; /* output frame number */
124		int (rcvf)(); / recover function */
125		} pslot; / process slots */
126		int npslots; /* number of process slots */
127
111	–	int lastpid; /* ID of last completed background process */
112	–	PSERVER lastpserver; / last process server used */
113	–
128		#define phostname(ps) ((ps)->hostname[0] ? (ps)->hostname : astat.host)
129	+	PSERVER lastpserver; / last process server with error */
130
131	<	struct pslot *findpslot();
131	>	static struct pslot * findpslot(RT_PID pid);
132	>	static void checkdir(void);
133	>	static VIEW * getview(int n);
134
135	<	VIEW *getview();
136	<	char *getexp();
135	>	static char * dirfile(char df, register char path);
136	>	static char * getexp(int n);
137	>	static int getblur(double mbf, double dbf);
138	>	static int getastat(void);
139	>	static void getradfile(char *rfargs);
140	>	static void badvalue(int vc);
141	>	static int rmfile(char *fn);
142	>	static int runcom(char *cs);
143	>	static int pruncom(char com, char ppins, int maxcopies);
144	>	static void bwait(int ncoms);
145	>	static RT_PID bruncom(char com, int fout, int (rf)());
146	>	static int serverdown(void);
147	>	static pscompfunc donecom;
148	>	static int countviews(void);
149	>	static int dofilt(int frame, int rvr);
150	>	static void archive(void);
151	>	static int frecover(int frame);
152	>	static int recover(int frame);
153	>	static void sethosts(void);
154	>	static void walkwait(int first, int last, char *vfn);
155	>	static void animrend(int frame, VIEW *vp);
156	>	static void transferframes(void);
157	>	static void filterframes(void);
158	>	static void renderframes(int nframes);
159	>	static void animate(void);
160	>	static void setdefaults(void);
161	>	static void putastat(void);
162
121	–	extern time_t fdate(), time();
163
164	<
165	<	main(argc, argv)
166	<	int argc;
167	<	char *argv[];
164	>	int
165	>	main(
166	>	int argc,
167	>	char *argv[]
168	>	)
169		{
170		int explicate = 0;
171		int i;
#	Line 151 \| Line 193 \| *char argv[];**
193		cfname = argv[i];
194		/* load variables */
195		loadvars(cfname);
196	+	/* check variables */
197	+	checkvalues();
198		/* did we get DIRECTORY? */
199		checkdir();
200		/* check status */
#	Line 174 \| Line 218 \| *char argv[];**
218		animate();
219		/* all done */
220		if (vdef(NEXTANIM)) {
221	+	char *fullp;
222		argv[i] = vval(NEXTANIM); /* just change input file */
223		if (!silent)
224		printargs(argc, argv, stdout);
225	<	if ((argv[0] = getpath(progname,getenv("PATH"),X_OK)) == NULL)
226	<	fprintf(stderr, "%s: command not found\n", progname);
225	>	fflush(stdout);
226	>	if ((fullp = getpath(argv[0],getenv("PATH"),X_OK)) == NULL)
227	>	fprintf(stderr, "%s: command not found\n", argv[0]);
228		else
229	<	execv(progname, argv);
229	>	execv(fullp, argv);
230		quit(1);
231		}
232		quit(0);
233	+	return(0); /* pro forma return */
234		userr:
235		fprintf(stderr, "Usage: %s [-s][-n][-w][-e] anim_file\n", progname);
236		quit(1);
237	+	return 1; /* pro forma return */
238		}
239
240
241	<	getastat() /* check/set animation status */
241	>	static int
242	>	getastat(void) /* check/set animation status */
243		{
244		char sfname[256];
245		FILE *fp;
#	Line 231 \| Line 280 \| *getastat() / check/set animation status /*
280		}
281		/* assume it is dead */
282		}
283	<	if (strcmp(cfname, astat.cfname) && astat.tnext != 0) { /* other's */
283	>	if (strcmp(cfname, astat.cfname) && astat.pid != 0) { /* other's */
284		fprintf(stderr, "%s: unfinished job \"%s\"\n",
285		progname, astat.cfname);
286		return(-1);
#	Line 254 \| Line 303 \| fmterr:
303		}
304
305
306	<	putastat() /* put out current status */
306	>	static void
307	>	putastat(void) /* put out current status */
308		{
309		char buf[256];
310		FILE *fp;
#	Line 276 \| Line 326 \| *putastat() / put out current status /*
326		}
327
328
329	<	checkdir() /* make sure we have our directory */
329	>	static void
330	>	checkdir(void) /* make sure we have our directory */
331		{
332		struct stat stb;
333
#	Line 298 \| Line 349 \| *checkdir() / make sure we have our directory /*
349		}
350
351
352	<	setdefaults() /* set default values */
352	>	static void
353	>	setdefaults(void) /* set default values */
354		{
355		extern char *atos();
356	+	int decades;
357		char buf[256];
358
359		if (vdef(ANIMATE)) {
#	Line 334 \| Line 387 \| *setdefaults() / set default values /*
387		quit(1);
388		}
389		if (!vdef(BASENAME)) {
390	<	sprintf(buf, "%s/frame%%03d", vval(DIRECTORY));
390	>	decades = (int)log10((double)vint(END)) + 1;
391	>	if (decades < 3) decades = 3;
392	>	sprintf(buf, "%s/frame%%0%dd", vval(DIRECTORY), decades);
393		vval(BASENAME) = savqstr(buf);
394		vdef(BASENAME)++;
395		}
#	Line 361 \| Line 416 \| *setdefaults() / set default values /*
416		if (!vdef(DISKSPACE)) {
417		if (!nowarn)
418		fprintf(stderr,
419	<	"%s: warning - no %s setting, assuming 100 Mbytes available\n",
419	>	"%s: warning - no %s setting, assuming 1000 Mbytes available\n",
420		progname, vnam(DISKSPACE));
421	<	vval(DISKSPACE) = "100";
421	>	vval(DISKSPACE) = "1000";
422		vdef(DISKSPACE)++;
423		}
424		if (!vdef(RSH)) {
#	Line 383 \| Line 438 \| *setdefaults() / set default values /*
438		}
439
440
441	<	sethosts() /* set up process servers */
441	>	static void
442	>	sethosts(void) /* set up process servers */
443		{
444		extern char *iskip();
445		char buf[256], dir, uname;
#	Line 438 \| Line 494 \| *sethosts() / set up process servers /*
494		}
495		}
496
497	<
498	<	getradfile(rfargs) /* run rad and get needed variables */
443	<	char *rfargs;
497	>	static void
498	>	getradfile(char rfargs) / run rad and get needed variables */
499		{
500		static short mvar[] = {OCTREE,PFILT,RESOLUTION,EXPOSURE,-1};
501		char combuf[256];
502		register int i;
503		register char *cp;
504	+	char *pippt = NULL;
505		/* create rad command */
506		sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY));
507		sprintf(combuf,
508		"rad -v 0 -s -e -w %s OPTFILE=%s \| egrep '^[ \t]*(NOMATCH",
509		rfargs, rendopt+2);
510		cp = combuf;
511	<	while (cp) cp++; / match unset variables */
511	>	while (*cp) {
512	>	if (*cp == '\|') pippt = cp;
513	>	cp++;
514	>	} /* match unset variables */
515		for (i = 0; mvar[i] >= 0; i++)
516		if (!vdef(mvar[i])) {
517		*cp++ = '\|';
518		strcpy(cp, vnam(mvar[i]));
519		while (*cp) cp++;
520	+	pippt = NULL;
521		}
522	<	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
523	<	cp += 11; /* point to file name */
524	<	if (system(combuf)) {
525	<	fprintf(stderr, "%s: error executing rad command:\n\t%s\n",
526	<	progname, combuf);
467	<	quit(1);
522	>	if (pippt != NULL)
523	>	strcpy(pippt, "> " NULL_DEVICE); /* nothing to match */
524	>	else {
525	>	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
526	>	cp += 11; /* point to file name */
527		}
528	<	loadvars(cp); /* load variables and remove file */
529	<	unlink(cp);
528	>	system(combuf); /* ignore exit code */
529	>	if (pippt == NULL) { /* load variables and remove file */
530	>	loadvars(cp);
531	>	unlink(cp);
532	>	}
533		}
534
535
536	<	animate() /* run animation */
536	>	static void
537	>	animate(void) /* run animation */
538		{
539		int xres, yres;
540		float pa, mult;
#	Line 501 \| Line 564 \| *animate() / run animation /*
564		progname, vnam(INTERP));
565		vval(INTERP) = "0";
566		}
567	<	if (atoi(vval(MBLUR))) { /* can't handle this yet */
567	>	if (strcmp(vval(MBLUR),"0")) { /* can't handle this */
568		if (!nowarn)
569		fprintf(stderr,
570		"%s: resetting %s=0 for animation\n",
#	Line 511 \| Line 574 \| *animate() / run animation /*
574		}
575		/* figure # frames per batch */
576		d1 = multxresmultyres4; /* space for orig. picture */
577	<	if ((i=vint(INTERP)) \|\| atoi(vval(MBLUR)))
577	>	if ((i=vint(INTERP)) \|\| getblur(NULL, NULL) > 1)
578		d1 += multxresmultyressizeof(float); /* Z-buffer */
579		d2 = xresyres4; /* space for final picture */
580		frames_batch = (i+1)(vflt(DISKSPACE)1048576.-d1)/(d1+i*d2);
#	Line 521 \| Line 584 \| *animate() / run animation /*
584		quit(1);
585		}
586		/* initialize archive argument list */
587	<	i = 16;
525	<	if (vdef(ARCHIVE) && strlen(vval(ARCHIVE)) > i)
526	<	i = strlen(vval(ARCHIVE));
587	>	i = vdef(ARCHIVE) ? strlen(vval(ARCHIVE))+132 : 132;
588		arcnext = arcfirst = arcargs + i;
589		/* initialize status file */
590		if (astat.rnext == 0)
#	Line 544 \| Line 605 \| *animate() / run animation /*
605		}
606
607
608	<	renderframes(nframes) /* render next nframes frames */
609	<	int nframes;
608	>	static void
609	>	renderframes(int nframes) /* render next nframes frames */
610		{
611		static char vendbuf[16];
612		VIEW *vp;
#	Line 601 \| Line 662 \| int nframes;
662		}
663
664
665	<	filterframes() /* catch up with filtering */
665	>	static void
666	>	filterframes(void) /* catch up with filtering */
667		{
606	–	VIEW *vp;
668		register int i;
669
670		if (astat.tnext < astat.fnext) /* other work to do first */
671		return;
672		/* filter each view */
673	<	for (i = astat.fnext; i < astat.rnext; i++) {
674	<	if ((vp = getview(i)) == NULL) { /* get view i */
675	<	fprintf(stderr,
615	<	"%s: unexpected error reading view for frame %d\n",
616	<	progname, i);
617	<	quit(1);
618	<	}
619	<	dofilt(i, vp, getexp(i), 0); /* filter frame */
620	<	}
673	>	for (i = astat.fnext; i < astat.rnext; i++)
674	>	dofilt(i, 0);
675	>
676		bwait(0); /* wait for filter processes */
677		archive(); /* archive originals */
678		astat.fnext = i; /* update status */
#	Line 625 \| Line 680 \| *filterframes() / catch up with filtering /*
680		}
681
682
683	<	transferframes() /* catch up with picture transfers */
683	>	static void
684	>	transferframes(void) /* catch up with picture transfers */
685		{
686	<	char combuf[10240];
686	>	char combuf[10240], *fbase;
687		register char *cp;
688		register int i;
689
#	Line 638 \| Line 694 \| *transferframes() / catch up with picture transfers**
694		putastat(); /* update status */
695		return;
696		}
697	<	strcpy(combuf, vval(TRANSFER)); /* start transfer command */
698	<	cp = combuf + strlen(combuf);
697	>	strcpy(combuf, "cd "); /* start transfer command */
698	>	fbase = dirfile(cp = combuf+3, vval(BASENAME));
699	>	if (*cp) {
700	>	while (*++cp) ;
701	>	cp++ = ';'; cp++ = ' ';
702	>	} else
703	>	cp = combuf;
704	>	strcpy(cp, vval(TRANSFER));
705	>	while (*cp) cp++;
706		/* make argument list */
707		for (i = astat.tnext; i < astat.fnext; i++) {
708		*cp++ = ' ';
709	<	sprintf(cp, vval(BASENAME), i);
709	>	sprintf(cp, fbase, i);
710		while (*cp) cp++;
711	<	strcpy(cp, ".pic");
711	>	strcpy(cp, ".hdr");
712		cp += 4;
713		}
714		if (runcom(combuf)) { /* transfer frames */
#	Line 658 \| Line 721 \| *transferframes() / catch up with picture transfers**
721		}
722
723
724	<	animrend(frame, vp) /* start animation frame */
725	<	int frame;
726	<	VIEW *vp;
724	>	static void
725	>	animrend( /* start animation frame */
726	>	int frame,
727	>	VIEW *vp
728	>	)
729		{
665	–	extern int recover();
730		char combuf[2048];
731		char fname[128];
732
#	Line 676 \| Line 740 \| *VIEW vp;**
740		}
741
742
743	<	walkwait(first, last, vfn) /* walk-through frames */
744	<	int first, last;
745	<	char *vfn;
743	>	static void
744	>	walkwait( /* walk-through frames */
745	>	int first,
746	>	int last,
747	>	char *vfn
748	>	)
749		{
750	+	double mblurf, dblurf;
751	+	int nblur = getblur(&mblurf, &dblurf);
752		char combuf[2048];
753	<	char *inspoint;
753	>	register char *inspoint;
754		register int i;
755
756		if (!noaction && vint(INTERP)) /* create dummy frames */
#	Line 692 \| Line 761 \| *char vfn;**
761		close(open(combuf, O_RDONLY\|O_CREAT, 0666));
762		}
763		/* create command */
764	<	sprintf(combuf, "rpict%s -w0", rendopt);
765	<	if (vint(INTERP) \|\| atoi(vval(MBLUR)))
766	<	sprintf(combuf+strlen(combuf), " -z %s.zbf", vval(BASENAME));
767	<	sprintf(combuf+strlen(combuf), " -o %s.unf %s -S %d",
764	>	sprintf(combuf, "rpict%s%s -w0", rendopt,
765	>	viewopt(getview(first>1 ? first-1 : 1)));
766	>	inspoint = combuf;
767	>	while (*inspoint) inspoint++;
768	>	if (nblur) {
769	>	sprintf(inspoint, " -pm %.3f", mblurf/nblur);
770	>	while (*inspoint) inspoint++;
771	>	sprintf(inspoint, " -pd %.3f", dblurf/nblur);
772	>	while (*inspoint) inspoint++;
773	>	}
774	>	if (nblur > 1 \|\| vint(INTERP)) {
775	>	sprintf(inspoint, " -z %s.zbf", vval(BASENAME));
776	>	while (*inspoint) inspoint++;
777	>	}
778	>	sprintf(inspoint, " -o %s.unf %s -S %d",
779		vval(BASENAME), rresopt, first);
780	<	inspoint = combuf + strlen(combuf);
780	>	while (*inspoint) inspoint++;
781		sprintf(inspoint, " %s < %s", vval(OCTREE), vfn);
782		/* run in parallel */
783		i = (last-first+1)/(vint(INTERP)+1);
#	Line 717 \| Line 797 \| *char vfn;**
797		}
798
799
800	<	int
801	<	recover(frame) /* recover the specified frame */
722	<	int frame;
800	>	static int
801	>	recover(int frame) /* recover the specified frame */
802		{
803		static int rfrm; / list of recovered frames */
804		static int nrfrms = 0;
805	+	double mblurf, dblurf;
806	+	int nblur = getblur(&mblurf, &dblurf);
807		char combuf[2048];
808		char fname[128];
809		register char *cp;
#	Line 738 \| Line 819 \| int frame;
819		vval(ANIMATE), frame, rendopt);
820		else
821		sprintf(combuf, "rpict%s -w0", rendopt);
822	<	cp = combuf + strlen(combuf);
823	<	if (vint(INTERP) \|\| atoi(vval(MBLUR))) {
822	>	cp = combuf;
823	>	while (*cp) cp++;
824	>	if (nblur) {
825	>	sprintf(cp, " -pm %.3f", mblurf/nblur);
826	>	while (*cp) cp++;
827	>	sprintf(cp, " -pd %.3f", dblurf/nblur);
828	>	while (*cp) cp++;
829	>	}
830	>	if (nblur > 1 \|\| vint(INTERP)) {
831		sprintf(cp, " -z %s.zbf", fname);
832		while (*cp) cp++;
833		}
#	Line 753 \| Line 841 \| int frame;
841		return(1);
842		/* add frame to recovered list */
843		if (nrfrms)
844	<	rfrm = (int )realloc((char )rfrm, (nrfrms+1)*sizeof(int));
844	>	rfrm = (int )realloc((void )rfrm, (nrfrms+1)*sizeof(int));
845		else
846		rfrm = (int *)malloc(sizeof(int));
847		if (rfrm == NULL) {
#	Line 765 \| Line 853 \| int frame;
853		}
854
855
856	<	int
857	<	frecover(frame) /* recover filtered frame */
770	<	int frame;
856	>	static int
857	>	frecover(int frame) /* recover filtered frame */
858		{
859	<	VIEW *vp;
773	<	char *ex;
774	<
775	<	vp = getview(frame);
776	<	ex = getexp(frame);
777	<	if (dofilt(frame, vp, ex, 2) && dofilt(frame, vp, ex, 1))
859	>	if (dofilt(frame, 2) && dofilt(frame, 1))
860		return(1);
861		return(0);
862		}
863
864
865	<	archive() /* archive and remove renderings */
865	>	static void
866	>	archive(void) /* archive and remove renderings */
867		{
868		#define RMCOML (sizeof(rmcom)-1)
869		static char rmcom[] = "rm -f";
870	<	register int i;
870	>	char basedir[128];
871	>	int dlen, alen;
872	>	register int j;
873
874		if (arcnext == arcfirst)
875		return; /* nothing to do */
876	+	dirfile(basedir, vval(BASENAME));
877	+	dlen = strlen(basedir);
878		if (vdef(ARCHIVE)) { /* run archive command */
879	<	i = strlen(vval(ARCHIVE));
880	<	strncpy(arcfirst-i, vval(ARCHIVE), i);
881	<	if (runcom(arcfirst-i)) {
879	>	alen = strlen(vval(ARCHIVE));
880	>	if (dlen) {
881	>	j = alen + dlen + 5;
882	>	strncpy(arcfirst-j, "cd ", 3);
883	>	strncpy(arcfirst-j+3, basedir, dlen);
884	>	(arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' ';
885	>	} else
886	>	j = alen;
887	>	strncpy(arcfirst-alen, vval(ARCHIVE), alen);
888	>	if (runcom(arcfirst-j)) {
889		fprintf(stderr, "%s: error running archive command\n",
890		progname);
891		quit(1);
892		}
893		}
894	+	if (dlen) {
895	+	j = RMCOML + dlen + 5;
896	+	strncpy(arcfirst-j, "cd ", 3);
897	+	strncpy(arcfirst-j+3, basedir, dlen);
898	+	(arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' ';
899	+	} else
900	+	j = RMCOML;
901		/* run remove command */
902		strncpy(arcfirst-RMCOML, rmcom, RMCOML);
903	<	runcom(arcfirst-RMCOML);
903	>	runcom(arcfirst-j);
904		arcnext = arcfirst; /* reset argument list */
905		#undef RMCOML
906		}
907
908
909	<	int
910	<	dofilt(frame, vp, ep, rvr) /* filter frame */
911	<	int frame;
912	<	VIEW *vp;
913	<	char *ep;
813	<	int rvr;
909	>	static int
910	>	dofilt( /* filter frame */
911	>	int frame,
912	>	int rvr
913	>	)
914		{
815	–	extern int frecover();
915		static int iter = 0;
916	<	char fnbefore[128], fnafter[128];
916	>	double mblurf, dblurf;
917	>	int nblur = getblur(&mblurf, &dblurf);
918	>	VIEW *vp = getview(frame);
919	>	char *ep = getexp(frame);
920	>	char fnbefore[128], fnafter[128], *fbase;
921		char combuf[1024], fname0[128], fname1[128];
922		int usepinterp, usepfilt, nora_rgbe;
923		int frseq[2];
924		/* check what is needed */
925	<	usepinterp = atoi(vval(MBLUR));
926	<	usepfilt = pfiltalways \| ep==NULL;
925	>	if (vp == NULL) {
926	>	fprintf(stderr,
927	>	"%s: unexpected error reading view for frame %d\n",
928	>	progname, frame);
929	>	quit(1);
930	>	}
931	>	usepinterp = (nblur > 1);
932	>	usepfilt = pfiltalways \| (ep==NULL);
933		if (ep != NULL && !strcmp(ep, "1"))
934		ep = "+0";
935		nora_rgbe = strcmp(vval(OVERSAMP),"1") \|\| ep==NULL \|\|
#	Line 828 \| Line 937 \| int rvr;
937		/* compute rendered views */
938		frseq[0] = frame - ((frame-1) % (vint(INTERP)+1));
939		frseq[1] = frseq[0] + vint(INTERP) + 1;
940	+	fbase = dirfile(NULL, vval(BASENAME));
941		if (frseq[1] > vint(END))
942		frseq[1] = vint(END);
943		if (frseq[1] == frame) { /* pfilt only */
#	Line 836 \| Line 946 \| int rvr;
946		usepfilt \|= nora_rgbe;
947		} else if (frseq[0] == frame) { /* no interpolation needed */
948		if (!rvr && frame > 1+vint(INTERP)) { /* archive previous */
949	+	if (arcnext - arcargs +
950	+	strlen(fbase) >= sizeof(arcargs)-8) {
951	+	fprintf(stderr,
952	+	"%s: too many filenames in archive command -- reduce %s variable\n",
953	+	progname, vnam(DISKSPACE));
954	+	quit(1);
955	+	}
956		*arcnext++ = ' ';
957	<	sprintf(arcnext, vval(BASENAME), frame-vint(INTERP)-1);
957	>	sprintf(arcnext, fbase, frame-vint(INTERP)-1);
958		while (*arcnext) arcnext++;
959		strcpy(arcnext, ".unf");
960		arcnext += 4;
961		if (usepinterp \|\| vint(INTERP)) { /* and Z-buf */
962		*arcnext++ = ' ';
963	<	sprintf(arcnext, vval(BASENAME),
847	<	frame-vint(INTERP)-1);
963	>	sprintf(arcnext, fbase, frame-vint(INTERP)-1);
964		while (*arcnext) arcnext++;
965		strcpy(arcnext, ".zbf");
966		arcnext += 4;
#	Line 864 \| Line 980 \| int rvr;
980		if (usepinterp) { /* using pinterp */
981		if (rvr == 2 && recover(frseq[1])) /* recover after? */
982		return(1);
983	<	if (atoi(vval(MBLUR))) {
868	<	FILE fp; / motion blurring */
983	>	if (nblur > 1) { /* with pdmblur */
984		sprintf(fname0, "%s/vw0%c", vval(DIRECTORY),
985		'a'+(iter%26));
871	–	if ((fp = fopen(fname0, "w")) == NULL) {
872	–	perror(fname0); quit(1);
873	–	}
874	–	fputs(VIEWSTR, fp);
875	–	fprintview(vp, fp);
876	–	putc('\n', fp); fclose(fp);
877	–	if ((vp = getview(frame+1)) == NULL) {
878	–	fprintf(stderr,
879	–	"%s: unexpected error reading view for frame %d\n",
880	–	progname, frame+1);
881	–	quit(1);
882	–	}
986		sprintf(fname1, "%s/vw1%c", vval(DIRECTORY),
987		'a'+(iter%26));
988	<	if ((fp = fopen(fname1, "w")) == NULL) {
989	<	perror(fname1); quit(1);
988	>	if (!noaction) {
989	>	FILE fp; / motion blurring */
990	>	if ((fp = fopen(fname0, "w")) == NULL) {
991	>	perror(fname0); quit(1);
992	>	}
993	>	fputs(VIEWSTR, fp);
994	>	fprintview(vp, fp);
995	>	putc('\n', fp); fclose(fp);
996	>	if ((vp = getview(frame+1)) == NULL) {
997	>	fprintf(stderr,
998	>	"%s: unexpected error reading view for frame %d\n",
999	>	progname, frame+1);
1000	>	quit(1);
1001	>	}
1002	>	if ((fp = fopen(fname1, "w")) == NULL) {
1003	>	perror(fname1); quit(1);
1004	>	}
1005	>	fputs(VIEWSTR, fp);
1006	>	fprintview(vp, fp);
1007	>	putc('\n', fp); fclose(fp);
1008		}
888	–	fputs(VIEWSTR, fp);
889	–	fprintview(vp, fp);
890	–	putc('\n', fp); fclose(fp);
1009		sprintf(combuf,
1010	<	"(pmblur %s %d %s %s; rm -f %s %s) \| pinterp -B",
1011	<	*sskip(vval(MBLUR)) ? sskip2(vval(MBLUR),1) : "1",
894	<	atoi(vval(MBLUR)),
1010	>	"(pmdblur %.3f %.3f %d %s %s; rm -f %s %s) \| pinterp -B -a",
1011	>	mblurf, dblurf, nblur,
1012		fname0, fname1, fname0, fname1);
1013		iter++;
1014		} else /* no blurring */
#	Line 899 \| Line 1016 \| int rvr;
1016		strcat(combuf, viewopt(vp));
1017		if (vbool(RTRACE))
1018		sprintf(combuf+strlen(combuf), " -ff -fr '%s -w0 %s'",
1019	<	rendopt, vval(OCTREE));
1019	>	rendopt+1, vval(OCTREE));
1020		if (vdef(PINTERP))
1021		sprintf(combuf+strlen(combuf), " %s", vval(PINTERP));
1022		if (usepfilt)
1023		sprintf(combuf+strlen(combuf), " %s", rresopt);
1024		else
1025	<	sprintf(combuf+strlen(combuf), " %s -e %s",
1025	>	sprintf(combuf+strlen(combuf), " -a %s -e %s",
1026		fresopt, ep);
1027		sprintf(combuf+strlen(combuf), " %s.unf %s.zbf",
1028		fnbefore, fnbefore);
#	Line 944 \| Line 1061 \| int rvr;
1061		}
1062		/* output file name */
1063		sprintf(fname0, vval(BASENAME), frame);
1064	<	sprintf(combuf+strlen(combuf), " > %s.pic", fname0);
1064	>	sprintf(combuf+strlen(combuf), " > %s.hdr", fname0);
1065		if (rvr) /* in recovery */
1066		return(runcom(combuf));
1067		bruncom(combuf, frame, frecover); /* else run in background */
#	Line 952 \| Line 1069 \| int rvr;
1069		}
1070
1071
1072	<	VIEW *
1073	<	getview(n) /* get view number n */
957	<	int n;
1072	>	static VIEW *
1073	>	getview(int n) /* get view number n */
1074		{
1075		static FILE viewfp = NULL; / view file pointer */
1076		static int viewnum = 0; /* current view number */
#	Line 966 \| Line 1082 \| int n;
1082		fclose(viewfp);
1083		viewfp = NULL;
1084		viewnum = 0;
1085	<	copystruct(&curview, &stdview);
1085	>	curview = stdview;
1086		}
1087		return(NULL);
1088		}
1089	<	if (viewfp == NULL) { /* open file */
1089	>	if (viewfp == NULL) { /* open file */
1090		if ((viewfp = fopen(vval(VIEWFILE), "r")) == NULL) {
1091		perror(vval(VIEWFILE));
1092		quit(1);
1093		}
1094	<	} else if (n < viewnum) { /* rewind file */
1094	>	} else if (n > 0 && n < viewnum) { /* rewind file */
1095		if (viewnum == 1 && feof(viewfp))
1096		return(&curview); /* just one view */
1097		if (fseek(viewfp, 0L, 0) == EOF) {
1098		perror(vval(VIEWFILE));
1099		quit(1);
1100		}
1101	<	copystruct(&curview, &stdview);
1101	>	curview = stdview;
1102		viewnum = 0;
1103		}
1104	+	if (n < 0) { /* get next view */
1105	+	register int c = getc(viewfp);
1106	+	if (c == EOF)
1107	+	return((VIEW )NULL); / that's it */
1108	+	ungetc(c, viewfp);
1109	+	n = viewnum + 1;
1110	+	}
1111		while (n > viewnum) { /* scan to desired view */
1112		if (fgets(linebuf, sizeof(linebuf), viewfp) == NULL)
1113		return(viewnum==1 ? &curview : (VIEW *)NULL);
#	Line 995 \| Line 1118 \| int n;
1118		}
1119
1120
1121	<	int
1122	<	countviews() /* count views in view file */
1121	>	static int
1122	>	countviews(void) /* count views in view file */
1123		{
1124	<	register int n = 0;
1124	>	int n;
1125
1126	<	while (getview(n+1) != NULL)
1126	>	if (getview(n=1) == NULL)
1127	>	return(0);
1128	>	while (getview(-1) != NULL)
1129		n++;
1130		return(n);
1131		}
1132
1133
1134	<	char *
1135	<	getexp(n) /* get exposure for nth frame */
1011	<	int n;
1134	>	static char *
1135	>	getexp(int n) /* get exposure for nth frame */
1136		{
1013	–	extern char *fskip();
1137		static char expval[32];
1138		static FILE *expfp = NULL;
1139		static long *exppos;
#	Line 1020 \| Line 1143 \| int n;
1143		if (n == 0) { /* signal to close file */
1144		if (expfp != NULL) {
1145		fclose(expfp);
1146	<	free((char *)exppos);
1146	>	free((void *)exppos);
1147		expfp = NULL;
1148		}
1149		return(NULL);
#	Line 1077 \| Line 1200 \| int n;
1200		}
1201
1202
1203	<	struct pslot *
1204	<	findpslot(pid) /* find or allocate a process slot */
1082	<	int pid;
1203	>	static struct pslot *
1204	>	findpslot(RT_PID pid) /* find or allocate a process slot */
1205		{
1206		register struct pslot *psempty = NULL;
1207		register int i;
#	Line 1094 \| Line 1216 \| int pid;
1216		}
1217
1218
1219	<	int
1220	<	donecom(ps, pn, status) /* clean up after finished process */
1221	<	PSERVER *ps;
1222	<	int pn;
1223	<	int status;
1219	>	static int
1220	>	donecom( /* clean up after finished process */
1221	>	PSERVER *ps,
1222	>	int pn,
1223	>	int status
1224	>	)
1225		{
1226	<	register PROC *pp;
1226	>	register NETPROC *pp;
1227	>	register struct pslot *psl;
1228
1229		pp = ps->proc + pn;
1230		if (pp->elen) { /* pass errors */
#	Line 1112 \| Line 1236 \| int status;
1236		if (ps->hostname[0])
1237		status = 1; /* because rsh doesn't return status */
1238		}
1239	+	lastpserver = NULL;
1240	+	psl = findpslot(pp->pid); /* check for bruncom() slot */
1241	+	if (psl->pid) {
1242	+	if (status) {
1243	+	if (psl->rcvf != NULL) /* attempt recovery */
1244	+	status = (*psl->rcvf)(psl->fout);
1245	+	if (status) {
1246	+	fprintf(stderr,
1247	+	"%s: error rendering frame %d\n",
1248	+	progname, psl->fout);
1249	+	quit(1);
1250	+	}
1251	+	lastpserver = ps;
1252	+	}
1253	+	psl->pid = 0; /* free process slot */
1254	+	} else if (status)
1255	+	lastpserver = ps;
1256		freestr(pp->com); /* free command string */
1116	–	lastpid = pp->pid; /* record PID for bwait() */
1117	–	lastpserver = ps; /* record server for serverdown() */
1257		return(status);
1258		}
1259
1260
1261	<	int
1262	<	serverdown() /* check status of last process server */
1261	>	static int
1262	>	serverdown(void) /* check status of last process server */
1263		{
1264	+	if (lastpserver == NULL \|\| !lastpserver->hostname[0])
1265	+	return(0);
1266		if (pserverOK(lastpserver)) /* server still up? */
1267		return(0);
1268		delpserver(lastpserver); /* else delete it */
#	Line 1134 \| Line 1275 \| *serverdown() / check status of last process server**
1275		}
1276
1277
1278	<	int
1279	<	bruncom(com, fout, rf) /* run a command in the background */
1280	<	char *com;
1281	<	int fout;
1282	<	int (*rf)();
1278	>	static RT_PID
1279	>	bruncom( /* run a command in the background */
1280	>	char *com,
1281	>	int fout,
1282	>	int (*rf)()
1283	>	)
1284		{
1285	<	int pid;
1285	>	RT_PID pid;
1286		register struct pslot *psl;
1287
1288		if (noaction) {
#	Line 1148 \| Line 1290 \| *int (rf)();**
1290		printf("\t%s\n", com); /* echo command */
1291		return(0);
1292		}
1293	<	/* else start it when we can */
1294	<	while ((pid = startjob(NULL, savestr(com), donecom)) == -1)
1293	>	com = savestr(com); /* else start it when we can */
1294	>	while ((pid = startjob(NULL, com, donecom)) == -1)
1295		bwait(1);
1296		if (!silent) { /* echo command */
1297		PSERVER *ps;
1298	<	int psn = pid;
1298	>	RT_PID psn = pid;
1299		ps = findjob(&psn);
1300		printf("\t%s\n", com);
1301		printf("\tProcess started on %s\n", phostname(ps));
#	Line 1167 \| Line 1309 \| *int (rf)();**
1309		}
1310
1311
1312	<	bwait(ncoms) /* wait for batch job(s) to finish */
1313	<	int ncoms;
1312	>	static void
1313	>	bwait(int ncoms) /* wait for batch job(s) to finish */
1314		{
1315		int status;
1174	–	register struct pslot *psl;
1316
1317		if (noaction)
1318		return;
1319		while ((status = wait4job(NULL, -1)) != -1) {
1320	<	psl = findpslot(lastpid);
1321	<	if (status) { /* attempt recovery */
1322	<	serverdown(); /* check server */
1182	<	if (psl->rcvf == NULL \|\| (*psl->rcvf)(psl->fout)) {
1183	<	fprintf(stderr,
1184	<	"%s: error rendering frame %d\n",
1185	<	progname, psl->fout);
1186	<	quit(1);
1187	<	}
1188	<	}
1189	<	psl->pid = 0; /* free process slot */
1190	<	if (!--ncoms)
1191	<	return; /* done enough */
1320	>	serverdown(); /* update server status */
1321	>	if (--ncoms == 0)
1322	>	break; /* done enough */
1323		}
1324		}
1325
1326
1327	<	int
1328	<	pruncom(com, ppins, maxcopies) /* run a command in parallel over network */
1329	<	char com, ppins;
1330	<	int maxcopies;
1327	>	static int
1328	>	pruncom( /* run a command in parallel over network */
1329	>	char *com,
1330	>	char *ppins,
1331	>	int maxcopies
1332	>	)
1333		{
1334		int retstatus = 0;
1335		int hostcopies;
1336	<	char buf[10240], *com1;
1204	<	PSERVER *mps[64];
1205	<	int nmps = 0;
1336	>	char buf[10240], com1, s;
1337		int status;
1338		int pfd;
1339		register int n;
#	Line 1220 \| Line 1351 \| int maxcopies;
1351		strcpy(com1=buf, com); /* build -PP command */
1352		sprintf(com1+(ppins-com), " -PP %s/%s.persist",
1353		vval(DIRECTORY), phostname(ps));
1354	+	unlink(com1+(ppins-com)+5);
1355		strcat(com1, ppins);
1224	–	mps[nmps++] = ps;
1356		} else
1357		com1 = com;
1358	<	while (maxcopies > 0 &&
1359	<	startjob(ps, savestr(com1), donecom) != -1) {
1360	<	sleep(60);
1361	<	hostcopies++;
1362	<	maxcopies--;
1358	>	while (maxcopies > 0) {
1359	>	s = savestr(com1);
1360	>	if (startjob(ps, s, donecom) != -1) {
1361	>	sleep(20);
1362	>	hostcopies++;
1363	>	maxcopies--;
1364	>	} else {
1365	>	freestr(s);
1366	>	break;
1367	>	}
1368		}
1369		if (!silent && hostcopies) {
1370		if (hostcopies > 1)
#	Line 1241 \| Line 1377 \| int maxcopies;
1377		}
1378		/* wait for jobs to finish */
1379		while ((status = wait4job(NULL, -1)) != -1)
1380	<	if (status)
1245	<	retstatus += !serverdown(); /* check server */
1380	>	retstatus += status && !serverdown();
1381		/* terminate parallel rpict's */
1382	<	while (nmps--) {
1383	<	sprintf(buf, "%s/%s.persist",
1249	<	vval(DIRECTORY), phostname(mps[nmps]));
1382	>	for (ps = pslist; ps != NULL; ps = ps->next) {
1383	>	sprintf(buf, "%s/%s.persist", vval(DIRECTORY), phostname(ps));
1384		if ((pfd = open(buf, O_RDONLY)) >= 0) {
1385		n = read(pfd, buf, sizeof(buf)-1); /* get PID */
1386		buf[n] = '\0';
#	Line 1255 \| Line 1389 \| int maxcopies;
1389		;
1390		/* terminate */
1391		sprintf(buf, "kill -ALRM %d", atoi(buf+n));
1392	<	wait4job(mps[nmps], startjob(mps[nmps], buf, NULL));
1392	>	wait4job(ps, startjob(ps, buf, NULL));
1393		}
1394		}
1395		return(retstatus);
1396		}
1397
1398
1399	<	runcom(cs) /* run a command locally and wait for it */
1400	<	char *cs;
1399	>	static int
1400	>	runcom(char cs) / run a command locally and wait for it */
1401		{
1402		if (!silent) /* echo it */
1403		printf("\t%s\n", cs);
#	Line 1274 \| Line 1408 \| *char cs;**
1408		}
1409
1410
1411	<	rmfile(fn) /* remove a file */
1412	<	char *fn;
1411	>	static int
1412	>	rmfile(char fn) / remove a file */
1413		{
1414		if (!silent)
1415	<	#ifdef MSDOS
1415	>	#if defined(_WIN32) \|\| defined(_WIN64)
1416		printf("\tdel %s\n", fn);
1417		#else
1418		printf("\trm -f %s\n", fn);
#	Line 1289 \| Line 1423 \| *char fn;**
1423		}
1424
1425
1426	<	badvalue(vc) /* report bad variable value and exit */
1427	<	int vc;
1426	>	static void
1427	>	badvalue(int vc) /* report bad variable value and exit */
1428		{
1429		fprintf(stderr, "%s: bad value for variable '%s'\n",
1430		progname, vnam(vc));
1431		quit(1);
1432	+	}
1433	+
1434	+
1435	+	static char *
1436	+	dirfile( /* separate path into directory and file */
1437	+	char *df,
1438	+	register char *path
1439	+	)
1440	+	{
1441	+	register int i;
1442	+	int psep;
1443	+
1444	+	for (i = 0, psep = -1; path[i]; i++)
1445	+	if (path[i] == '/')
1446	+	psep = i;
1447	+	if (df != NULL) {
1448	+	if (psep == 0) {
1449	+	df[0] = '/';
1450	+	df[1] = '\0';
1451	+	} else if (psep > 0) {
1452	+	strncpy(df, path, psep);
1453	+	df[psep] = '\0';
1454	+	} else
1455	+	df[0] = '\0';
1456	+	}
1457	+	return(path+psep+1);
1458	+	}
1459	+
1460	+
1461	+	static int
1462	+	getblur(double mbf, double dbf) /* get # blur samples (and fraction) */
1463	+	{
1464	+	double mblurf, dblurf;
1465	+	int nmblur, ndblur;
1466	+	char *s;
1467	+	/* get motion blur */
1468	+	if (!vdef(MBLUR) \|\| (mblurf = atof(vval(MBLUR))) < 0.0)
1469	+	mblurf = 0.0;
1470	+	if (mbf != NULL)
1471	+	*mbf = mblurf;
1472	+	if (mblurf <= FTINY)
1473	+	nmblur = 0;
1474	+	else if (!*(s = sskip(vval(MBLUR))))
1475	+	nmblur = DEF_NBLUR;
1476	+	else if ((nmblur = atoi(s)) <= 0)
1477	+	nmblur = 1;
1478	+	/* get depth-of-field blur */
1479	+	if (!vdef(DBLUR) \|\| (dblurf = atof(vval(DBLUR))) < 0.0)
1480	+	dblurf = 0.0;
1481	+	if (dbf != NULL)
1482	+	*dbf = dblurf;
1483	+	if (dblurf <= FTINY)
1484	+	ndblur = 0;
1485	+	else if (!*(s = sskip(vval(DBLUR))))
1486	+	ndblur = DEF_NBLUR;
1487	+	else if ((ndblur = atoi(s)) <= 0)
1488	+	ndblur = 1;
1489	+	if ((nmblur == 1) & (ndblur == 1))
1490	+	return(1);
1491	+	/* return combined samples */
1492	+	return(nmblur + ndblur);
1493		}

Diff Legend

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

Comparing src/util/ranimate.c (file contents): Revision 2.17 by greg, Wed Jul 3 15:26:44 1996 UTC vs. Revision 2.56 by schorsch, Sun Mar 6 01:13:18 2016 UTC

Diff Legend

Comparing src/util/ranimate.c (file contents):
Revision 2.17 by greg, Wed Jul 3 15:26:44 1996 UTC vs.
Revision 2.56 by schorsch, Sun Mar 6 01:13:18 2016 UTC