--- ray/src/util/genklemsamp.pl	2011/05/16 23:56:32	2.11
+++ ray/src/util/genklemsamp.pl	2016/02/28 00:28:36	2.13
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# RCSid $Id: genklemsamp.pl,v 2.11 2011/05/16 23:56:32 greg Exp $
+# RCSid $Id: genklemsamp.pl,v 2.13 2016/02/28 00:28:36 greg Exp $
 #
 # Sample Klems (full) directions impinging on surface(s)
 #
@@ -76,7 +76,7 @@ if ($windoz) {
 			"-e \"and(a,b):if(a,b,a);sq(x):x*x\" -e \"$vwset\" " .
 			q{-e "nOK=sq(Vdx*$5+Vdy*$6+Vdz*$7)-.999" } .
 			" > $td\\origins.txt";
-	$rmtmp = "rmdir /S /Q $td";
+	$rmtmp = "rd /S /Q $td";
 } else {
 	$td = mkdtemp("/tmp/genklemsamp.XXXXXX");
 	chomp $td;
@@ -99,7 +99,7 @@ sub GetNOrigins {
 }
 # Do we have any Radiance input files?
 if ($#ARGV >= 0) {
-	system "oconv -f @ARGV > $td/surf.oct";
+	system "xform -m void @ARGV | oconv - > $td/surf.oct";
 	# Set our own view center and size based on bounding cube
 	$_ = $vwset; s/^.*Vdx://; s/;.*$//;
 	my @vd = $_;