--- ray/src/ot/cvmesh.c	2004/01/29 22:21:34	2.8
+++ ray/src/ot/cvmesh.c	2014/01/24 01:26:44	2.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: cvmesh.c,v 2.8 2004/01/29 22:21:34 greg Exp $";
+static const char RCSid[] = "$Id: cvmesh.c,v 2.12 2014/01/24 01:26:44 greg Exp $";
 #endif
 /*
  *  Radiance triangle mesh conversion routines
@@ -37,10 +37,16 @@ MESH	*ourmesh = NULL;		/* our global mesh data structu
 
 FVECT	meshbounds[2];			/* mesh bounding box */
 
+static void add2bounds(FVECT vp, RREAL vc[2]);
+static OBJECT cvmeshtri(OBJECT obj);
+static OCTREE cvmeshoct(OCTREE ot);
 
+
+
 MESH *
-cvinit(nm)			/* initialize empty mesh */
-char	*nm;
+cvinit(			/* initialize empty mesh */
+	char	*nm
+)
 {
 				/* free old mesh, first */
 	if (ourmesh != NULL) {
@@ -69,72 +75,11 @@ nomem:
 }
 
 
-int
-cvpoly(mo, n, vp, vn, vc)	/* convert a polygon to extended triangles */
-OBJECT	mo;
-int	n;
-FVECT	*vp;
-FVECT	*vn;
-RREAL	(*vc)[2];
-{
-	int	tcnt = 0;
-	int	flags;
-	RREAL	*tn[3], *tc[3];
-	int	*ord;
-	int	i, j;
-
-	if (n < 3)		/* degenerate face */
-		return(0);
-	flags = MT_V;
-	if (vn != NULL) {
-		tn[0] = vn[0]; tn[1] = vn[1]; tn[2] = vn[2];
-		flags |= MT_N;
-	} else {
-		tn[0] = tn[1] = tn[2] = NULL;
-	}
-	if (vc != NULL) {
-		tc[0] = vc[0]; tc[1] = vc[1]; tc[2] = vc[2];
-		flags |= MT_UV;
-	} else {
-		tc[0] = tc[1] = tc[2] = NULL;
-	}
-	if (n == 3)		/* output single triangle */
-		return(cvtri(mo, vp[0], vp[1], vp[2],
-				tn[0], tn[1], tn[2],
-				tc[0], tc[1], tc[2]));
-
-				/* decimate polygon (assumes convex) */
-	ord = (int *)malloc(n*sizeof(int));
-	if (ord == NULL)
-		error(SYSTEM, "out of memory in cvpoly");
-	for (i = n; i--; )
-		ord[i] = i;
-	while (n >= 3) {
-		if (flags & MT_N)
-			for (i = 3; i--; )
-				tn[i] = vn[ord[i]];
-		if (flags & MT_UV)
-			for (i = 3; i--; )
-				tc[i] = vc[ord[i]];
-		tcnt += cvtri(mo, vp[ord[0]], vp[ord[1]], vp[ord[2]],
-				tn[0], tn[1], tn[2],
-				tc[0], tc[1], tc[2]);
-			/* remove vertex and rotate */
-		n--;
-		j = ord[0];
-		for (i = 0; i < n-1; i++)
-			ord[i] = ord[i+2];
-		ord[i] = j;
-	}
-	free((void *)ord);
-	return(tcnt);
-}
-
-
 static void
-add2bounds(vp, vc)		/* add point and uv coordinate to bounds */
-FVECT	vp;
-RREAL	vc[2];
+add2bounds(		/* add point and uv coordinate to bounds */
+	FVECT	vp,
+	RREAL	vc[2]
+)
 {
 	register int	j;
 
@@ -156,11 +101,18 @@ RREAL	vc[2];
 
 
 int				/* create an extended triangle */
-cvtri(mo, vp1, vp2, vp3, vn1, vn2, vn3, vc1, vc2, vc3)
-OBJECT	mo;
-FVECT	vp1, vp2, vp3;
-FVECT	vn1, vn2, vn3;
-RREAL	vc1[2], vc2[2], vc3[2];
+cvtri(
+	OBJECT	mo,
+	FVECT	vp1,
+	FVECT	vp2,
+	FVECT	vp3,
+	FVECT	vn1,
+	FVECT	vn2,
+	FVECT	vn3,
+	RREAL	vc1[2],
+	RREAL	vc2[2],
+	RREAL	vc3[2]
+)
 {
 	static OBJECT	fobj = OVOID;
 	char		buf[32];
@@ -203,7 +155,7 @@ RREAL	vc1[2], vc2[2], vc3[2];
 		fop = objptr(fobj);
 		fop->omod = mo;
 		fop->otype = OBJ_FACE;
-		sprintf(buf, "t%d", fobj);
+		sprintf(buf, "t%ld", (long)fobj);
 		fop->oname = savqstr(buf);
 		fop->oargs.nfargs = 9;
 		fop->oargs.farg = (RREAL *)malloc(9*sizeof(RREAL));
@@ -262,8 +214,9 @@ nomem:
 
 
 static OBJECT
-cvmeshtri(obj)			/* add an extended triangle to our mesh */
-OBJECT	obj;
+cvmeshtri(			/* add an extended triangle to our mesh */
+	OBJECT	obj
+)
 {
 	OBJREC		*o = objptr(obj);
 	TRIDATA		*ts;
@@ -299,7 +252,7 @@ OBJECT	obj;
 
 
 void
-cvmeshbounds()			/* set mesh boundaries */
+cvmeshbounds(void)			/* set mesh boundaries */
 {
 	int	i;
 
@@ -326,7 +279,7 @@ cvmeshbounds()			/* set mesh boundaries */
 			double	marg;		/* expand past endpoints */
 			marg = (2./(1L<<(8*sizeof(uint16)))) *
 					(ourmesh->uvlim[1][i] -
-					 ourmesh->uvlim[0][i]);
+					 ourmesh->uvlim[0][i]) + FTINY;
 			ourmesh->uvlim[0][i] -= marg;
 			ourmesh->uvlim[1][i] += marg;
 		}
@@ -336,8 +289,9 @@ cvmeshbounds()			/* set mesh boundaries */
 
 
 static OCTREE
-cvmeshoct(ot)			/* convert triangles in subtree */
-OCTREE	ot;
+cvmeshoct(			/* convert triangles in subtree */
+	OCTREE	ot
+)
 {
 	int	i;
 
@@ -361,7 +315,7 @@ OCTREE	ot;
 
 
 MESH *
-cvmesh()			/* convert mesh and octree leaf nodes */
+cvmesh(void)			/* convert mesh and octree leaf nodes */
 {
 	if (ourmesh == NULL)
 		return(NULL);