[ViewVC] Diff of: radiance/ray/src/rt/rcmain.c

Comparing ray/src/rt/rcmain.c (file contents):
Revision 2.11 by greg, Sun Aug 11 13:48:48 2013 UTC vs.
Revision 2.12 by greg, Sat Jul 19 18:19:33 2014 UTC

#	Line 169 \| Line 169 \| *main(int argc, char argv[])**
169		case '-': case '0': var = 0; break; \
170		default: goto badopt; }
171		char *curout = NULL;
172	+	char *prms = NULL;
173		char *binval = NULL;
174		int bincnt = 0;
175		int rval;
#	Line 268 \| Line 269 \| *main(int argc, char argv[])**
269		case 'h': /* header output */
270		bool(2,header);
271		break;
272	+	case 'p': /* parameter setting(s) */
273	+	check(2,"s");
274	+	prms = argv[++i];
275	+	break;
276		case 'b': /* bin expression/count */
277		if (argv[i][2] == 'n') {
278		check(3,"s");
#	Line 279 \| Line 284 \| *main(int argc, char argv[])**
284		break;
285		case 'm': /* modifier name */
286		check(2,"s");
287	<	addmodifier(argv[++i], curout, binval, bincnt);
287	>	addmodifier(argv[++i], curout, prms, binval, bincnt);
288		break;
289		case 'M': /* modifier file */
290		check(2,"s");
291	<	addmodfile(argv[++i], curout, binval, bincnt);
291	>	addmodfile(argv[++i], curout, prms, binval, bincnt);
292		break;
293		default:
294		goto badopt;
#	Line 347 \| Line 352 \| *main(int argc, char argv[])**
352
353		badopt:
354		fprintf(stderr,
355	<	"Usage: %s [-n nprocs][-V][-r][-e expr][-f source][-o ospec][-b binv][-bn N] {-m mod \| -M file} [rtrace options] octree\n",
355	>	"Usage: %s [-n nprocs][-V][-r][-e expr][-f source][-o ospec][-p p1=V1,p2=V2][-b binv][-bn N] {-m mod \| -M file} [rtrace options] octree\n",
356		progname);
357		sprintf(errmsg, "command line error at '%s'", argv[i]);
358		error(USER, errmsg);

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