--- ray/src/util/genBSDF.pl	2011/02/24 20:14:26	2.11
+++ ray/src/util/genBSDF.pl	2011/04/16 01:13:22	2.14
@@ -1,16 +1,17 @@
 #!/usr/bin/perl -w
-# RCSid $Id: genBSDF.pl,v 2.11 2011/02/24 20:14:26 greg Exp $
+# RCSid $Id: genBSDF.pl,v 2.14 2011/04/16 01:13:22 greg Exp $
 #
 # Compute BSDF based on geometry and material description
 #
 #	G. Ward
 #
 use strict;
+use File::Temp qw/ :mktemp  /;
 sub userror {
-	print STDERR "Usage: genBSDF [-n Nproc][-c Nsamp][-dim xmin xmax ymin ymax zmin zmax][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom] [input ..]\n";
+	print STDERR "Usage: genBSDF [-n Nproc][-c Nsamp][-r \"ropts\"][-dim xmin xmax ymin ymax zmin zmax][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom] [input ..]\n";
 	exit 1;
 }
-my $td = `mktemp -d /tmp/genBSDF.XXXXXX`;
+my $td = mkdtemp("/tmp/genBSDF.XXXXXX");
 chomp $td;
 my $nsamp = 1000;
 my $rtargs = "-w -ab 5 -ad 700 -lw 3e-6";
@@ -61,7 +62,7 @@ if ( $mgfin ) {
 	die "Could not load MGF input\n" if ( $? );
 	system "mgf2rad $mgfscn > $radscn";
 } else {
-	system "cat @ARGV | xform -e > $radscn";
+	system "xform -e @ARGV > $radscn";
 	die "Could not load Radiance input\n" if ( $? );
 	system "rad2mgf $radscn > $mgfscn" if ( $geout );
 }
@@ -192,7 +193,9 @@ print "\t\t\t<DeviceType>Integral</DeviceType>\n";
 if ( $geout ) {
 	print "\t\t\t<Geometry format=\"MGF\" unit=\"Meter\">\n";
 	printf "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2;
-	system "cat $mgfscn";
+	open(MGFSCN, "< $mgfscn");
+	while (<MGFSCN>) { print $_; }
+	close MGFSCN;
 	print "xf\n";
 	print "\t\t\t</Geometry>\n";
 }