--- ray/src/gen/gensurf.c	2007/10/09 04:44:54	2.17
+++ ray/src/gen/gensurf.c	2011/08/15 19:48:06	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: gensurf.c,v 2.17 2007/10/09 04:44:54 greg Exp $";
+static const char RCSid[] = "$Id: gensurf.c,v 2.20 2011/08/15 19:48:06 greg Exp $";
 #endif
 /*
  *  gensurf.c - program to generate functional surfaces
@@ -34,8 +34,8 @@ char  VNAME[] = 	"valid";		/* valid vertex name */
 
 #define  pvect(p)	printf(vformat, (p)[0], (p)[1], (p)[2])
 
-char  vformat[] = "%15.9g %15.9g %15.9g\n";
-char  tsargs[] = "4 surf_dx surf_dy surf_dz surf.cal\n";
+char  vformat[] = "%18.12g %18.12g %18.12g\n";
+char  tsargs[] = "4 surf_dx surf_dy surf_dz surf.cal";
 char  texname[] = "Phong";
 
 int  smooth = 0;		/* apply smoothing? */
@@ -229,7 +229,7 @@ loaddata(		/* load point data from file */
 		size--;
 	}
 	if (size == (m+n+1)*pointsize) {	/* no border after all */
-		dp = (RREAL *)realloc((void *)datarec.data,
+		dp = (RREAL *)realloc(datarec.data,
 				m*n*pointsize*sizeof(RREAL));
 		if (dp != NULL)
 			datarec.data = dp;
@@ -382,8 +382,7 @@ putsquare(		/* put out a square */
 	if (ok1 & ok2 && fdot(vc1,vc2) >= 1.0-FTINY*FTINY) {
 		printf("\n%s ", modname);
 		if (axis != -1) {
-			printf("texfunc %s\n", texname);
-			printf(tsargs);
+			printf("texfunc %s\n%s\n", texname, tsargs);
 			printf("0\n13\t%d\n", axis);
 			pvect(norm[0]);
 			pvect(norm[1]);
@@ -405,8 +404,7 @@ putsquare(		/* put out a square */
 	if (ok1) {
 		printf("\n%s ", modname);
 		if (axis != -1) {
-			printf("texfunc %s\n", texname);
-			printf(tsargs);
+			printf("texfunc %s\n%s\n", texname, tsargs);
 			printf("0\n13\t%d\n", axis);
 			pvect(norm[0]);
 			pvect(norm[1]);
@@ -424,8 +422,7 @@ putsquare(		/* put out a square */
 	if (ok2) {
 		printf("\n%s ", modname);
 		if (axis != -1) {
-			printf("texfunc %s\n", texname);
-			printf(tsargs);
+			printf("texfunc %s\n%s\n", texname, tsargs);
 			printf("0\n13\t%d\n", axis);
 			pvect(norm[0]);
 			pvect(norm[1]);