--- ray/src/cv/rad2mgf.c	2005/12/28 18:35:42	2.24
+++ ray/src/cv/rad2mgf.c	2019/12/28 18:05:14	2.28
@@ -1,13 +1,11 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rad2mgf.c,v 2.24 2005/12/28 18:35:42 greg Exp $";
+static const char	RCSid[] = "$Id: rad2mgf.c,v 2.28 2019/12/28 18:05:14 greg Exp $";
 #endif
 /*
  * Convert Radiance scene description to MGF
  */
 
 #include <ctype.h>
-#include <string.h>
-#include <stdio.h>
 
 #include "platform.h"
 #include "rtmath.h"
@@ -129,6 +127,7 @@ rad2mgf(		/* convert a Radiance file to MGF */
 	char	*inp
 )
 {
+	char  buf[512];
 	char  mod[128], typ[32], id[128], alias[128];
 	FUNARGS	fa;
 	register FILE	*fp;
@@ -689,11 +688,11 @@ o_plastic(	/* convert a plastic material */
 	puts("\tc");				/* put diffuse component */
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("\trd %.4f\n", cxyz[1]*(1. - fa->farg[3]));
+		printf("\t\tcxy %.6f %.6f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\trd %.6f\n", cxyz[1]*(1. - fa->farg[3]));
 	if (fa->farg[3] > FTINY) {		/* put specular component */
 		puts("\tc");
-		printf("\trs %.4f %.4f\n", fa->farg[3],
+		printf("\trs %.6f %.6f\n", fa->farg[3],
 				typ[7]=='2' ? .5*(fa->farg[4] + fa->farg[5]) :
 						fa->farg[4]);
 	}
@@ -720,10 +719,10 @@ o_metal(	/* convert a metal material */
 	puts("\tc");				/* put diffuse component */
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("\trd %.4f\n", cxyz[1]*(1. - fa->farg[3]));
+		printf("\t\tcxy %.6f %.6f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\trd %.6f\n", cxyz[1]*(1. - fa->farg[3]));
 						/* put specular component */
-	printf("\trs %.4f %.4f\n", cxyz[1]*fa->farg[3],
+	printf("\trs %.6f %.6f\n", cxyz[1]*fa->farg[3],
 			typ[5]=='2' ? .5*(fa->farg[4] + fa->farg[5]) :
 					fa->farg[4]);
 	return(0);
@@ -760,14 +759,14 @@ o_glass(	/* convert a glass material */
 	puts("\tc");
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("\trs %.4f 0\n", cxyz[1]);
+		printf("\t\tcxy %.6f %.6f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\trs %.6f 0\n", cxyz[1]);
 	rgb_cie(cxyz, trgb);			/* put transmitted component */
 	puts("\tc");
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("\tts %.4f 0\n", cxyz[1]);
+		printf("\t\tcxy %.6f %.6f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\tts %.6f 0\n", cxyz[1]);
 	return(0);
 }
 
@@ -794,13 +793,13 @@ o_dielectric(	/* convert a dielectric material */
 	printf("\tir %f 0\n", fa->farg[3]);	/* put index of refraction */
 	printf("\tsides 1\n");
 	puts("\tc");				/* put reflected component */
-	printf("\trs %.4f 0\n", F);
+	printf("\trs %.6f 0\n", F);
 	rgb_cie(cxyz, trgb);			/* put transmitted component */
 	puts("\tc");
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("\tts %.4f 0\n", cxyz[1]);
+		printf("\t\tcxy %.6f %.6f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\tts %.6f 0\n", cxyz[1]);
 	return(0);
 }
 
@@ -828,8 +827,8 @@ o_mirror(	/* convert a mirror material */
 	puts("\tc");				/* put specular component */
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("\trs %.4f 0\n", cxyz[1]);
+		printf("\t\tcxy %.6f %.6f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\trs %.6f 0\n", cxyz[1]);
 	return(0);
 }
 
@@ -845,7 +844,7 @@ o_trans(	/* convert a trans material */
 	COLOR	cxyz, rrgb;
 	double	rough, trans, tspec, d;
 
-	if (typ[4] == '2') {		/* trans2 */
+	if (typ[5] == '2') {		/* trans2 */
 		if (fa->nfargs != 8)
 			return(-1);
 		rough = .5*(fa->farg[4] + fa->farg[5]);
@@ -864,14 +863,14 @@ o_trans(	/* convert a trans material */
 	puts("\tc");				/* put transmitted diffuse */
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	if (d > FTINY)
-		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
-	printf("\ttd %.4f\n", cxyz[1]*trans*(1. - fa->farg[3])*(1. - tspec));
+		printf("\t\tcxy %.6f %.6f\n", cxyz[0]/d, cxyz[1]/d);
+	printf("\ttd %.6f\n", cxyz[1]*trans*(1. - fa->farg[3])*(1. - tspec));
 						/* put transmitted specular */
-	printf("\tts %.4f %.4f\n", cxyz[1]*trans*tspec*(1. - fa->farg[3]), rough);
+	printf("\tts %.6f %.6f\n", cxyz[1]*trans*tspec*(1. - fa->farg[3]), rough);
 						/* put reflected diffuse */
-	printf("\trd %.4f\n", cxyz[1]*(1. - fa->farg[3])*(1. - trans));
+	printf("\trd %.6f\n", cxyz[1]*(1. - fa->farg[3])*(1. - trans));
 	puts("\tc");				/* put reflected specular */
-	printf("\trs %.4f %.4f\n", fa->farg[3], rough);
+	printf("\trs %.6f %.6f\n", fa->farg[3], rough);
 	return(0);
 }
 
@@ -895,7 +894,7 @@ o_light(		/* convert a light type */
 	d = cxyz[0] + cxyz[1] + cxyz[2];
 	puts("\tc");
 	if (d > FTINY)
-		printf("\t\tcxy %.4f %.4f\n", cxyz[0]/d, cxyz[1]/d);
+		printf("\t\tcxy %.6f %.6f\n", cxyz[0]/d, cxyz[1]/d);
 	printf("\ted %.4g\n", cxyz[1]*(PI*WHTEFFICACY));
 	return(0);
 }