--- ray/src/util/do_results.tcl	1995/09/28 14:11:51	2.4
+++ ray/src/util/do_results.tcl	2011/10/26 20:06:17	2.9
@@ -1,4 +1,4 @@
-# SCCSid "$SunId$ LBL"
+# RCSid: $Id: do_results.tcl,v 2.9 2011/10/26 20:06:17 greg Exp $
 #
 # Results screen for trad
 #
@@ -9,6 +9,9 @@ set conv(TIFF-bw,suf)	.tif
 set conv(TIFF-24,nam)	"TIFF 24-bit"
 set conv(TIFF-24,com)	"ra_tiff %s %s"
 set conv(TIFF-24,suf)	.tif
+set conv(TIFF-Luv,nam)	"TIFF LogLuv"
+set conv(TIFF-Luv,com)	"ra_tiff -L %s %s"
+set conv(TIFF-Luv,suf)	.tif
 set conv(GIF-bw,nam)	"GIF B&W"
 set conv(GIF-bw,com)	"ra_gif -b %s %s"
 set conv(GIF-bw,suf)	.gif
@@ -21,23 +24,20 @@ set conv(PPM-bin,suf)	.ppm
 set conv(PPM-asc,nam)	"PPM (ASCII)"
 set conv(PPM-asc,com)	"ra_ppm -a %s %s"
 set conv(PPM-asc,suf)	.ppm
+set conv(BMP-bw,nam)	"BMP B&W"
+set conv(BMP-bw,com)	"ra_bmp -b %s %s"
+set conv(BMP-bw,suf)	.bmp
+set conv(BMP-clr,nam)	"BMP Color"
+set conv(BMP-clr,com)	"ra_bmp %s %s"
+set conv(BMP-clr,suf)	.bmp
 set conv(PICT,nam)	"PICT 32-bit"
 set conv(PICT,com)	"ra_pict -g 1.8 %s %s"
 set conv(PICT,suf)	.pict
-set conv(ras-bw,nam)	"Sun B&W"
-set conv(ras-bw,com)	"ra_pr -b %s %s"
-set conv(ras-bw,suf)	.ras
-set conv(ras-8,nam)	"Sun 8-bit"
-set conv(ras-8,com)	"ra_pr %s %s"
-set conv(ras-8,suf)	.ras
-set conv(ras-24,nam)	"Sun 24-bit"
-set conv(ras-24,com)	"ra_pr24 %s %s"
-set conv(ras-24,suf)	.ras
 set conv(PS-bw,nam)	"PostScript B&W"
-set conv(PS-bw,com)	"ra_ps %s %s"
+set conv(PS-bw,com)	"ra_ps -b -C %s %s"
 set conv(PS-bw,suf)	.ps
 set conv(PS-clr,nam)	"PostScript Color"
-set conv(PS-clr,com)	"ra_ps -c %s %s"
+set conv(PS-clr,com)	"ra_ps -c -C %s %s"
 set conv(PS-clr,suf)	.ps
 set conv(tga-bw,nam)	"Targa B&W"
 set conv(tga-bw,com)	"ra_t8 -b %s %s"
@@ -51,13 +51,13 @@ set conv(tga-16,suf)	.tga
 set conv(tga-24,nam)	"Targa 24-bit"
 set conv(tga-24,com)	"ra_t16 -3 %s %s"
 set conv(tga-24,suf)	.tga
-set conv(types) {GIF-bw GIF-8 PICT PS-bw PS-clr PPM-asc PPM-bin ras-bw ras-8\
-		ras-24 tga-bw tga-8 tga-16 tga-24 TIFF-bw TIFF-24}
+set conv(types) {GIF-bw GIF-8 PICT PS-bw PS-clr BMP-bw BMP-clr PPM-asc\
+		PPM-bin tga-bw tga-8 tga-16 tga-24 TIFF-bw TIFF-24}
 set conv(typ) tga-24
 
 proc testappend {flst tf} {	# test if tf exists and append to flst if so
 	upvar $flst mylist
-	if [file exists $tf] {
+	if [file isfile $tf] {
 		lappend mylist $tf
 	}
 }
@@ -67,9 +67,9 @@ proc list_views {} {		# List finished and unfinished p
 	set fpics {}
 	set ufpics {}
 	foreach vw $radvar(view) {
-		if [file exists ${rawfroot}_[lindex $vw 0].unf] {
+		if [file isfile ${rawfroot}_[lindex $vw 0].unf] {
 			lappend ufpics [lindex $vw 0]
-		} elseif {[file exists $radvar(PICTURE)_[lindex $vw 0].pic]} {
+		} elseif {[file isfile $radvar(PICTURE)_[lindex $vw 0].hdr]} {
 			lappend fpics [lindex $vw 0]
 		}
 	}
@@ -102,9 +102,9 @@ proc get_selpics {{getall 0}} {		# return selected pic
 	global fvwbox ufvwbox radvar rawfroot
 	set sl {}
 	foreach i [$fvwbox curselection] {
-		testappend sl $radvar(PICTURE)_[$fvwbox get $i].pic
+		testappend sl $radvar(PICTURE)_[$fvwbox get $i].hdr
 		if {$getall && $rawfroot != $radvar(PICTURE)} {
-			testappend sl ${rawfroot}_[$fvwbox get $i].pic
+			testappend sl ${rawfroot}_[$fvwbox get $i].hdr
 		}
 		if {$getall && $radvar(ZFILE) != {}} {
 			testappend sl $radvar(ZFILE)_[$fvwbox get $i].zbf
@@ -151,7 +151,7 @@ proc cnvpic {} {		# Convert selected pictures
 	set curmess "No finished pictures selected."
 	foreach i [$fvwbox curselection] {
 		set vw [$fvwbox get $i]
-		set p $radvar(PICTURE)_$vw.pic
+		set p $radvar(PICTURE)_$vw.hdr
 		set df [format $convdest $vw]
 		set curmess "Converting $p to $df..."
 		update
@@ -166,7 +166,7 @@ proc prtpic {} {		# Print selected pictures
 	global curmess prntcom radvar fvwbox
 	set curmess "No finished pictures selected."
 	foreach i [$fvwbox curselection] {
-		set p $radvar(PICTURE)_[$fvwbox get $i].pic
+		set p $radvar(PICTURE)_[$fvwbox get $i].hdr
 		set curmess "Printing $p..."
 		update
 		set pc [format $prntcom $p]