--- ray/src/common/urand.c	2003/06/07 12:50:21	2.7
+++ ray/src/common/urand.c	2015/05/27 08:42:06	2.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: urand.c,v 2.7 2003/06/07 12:50:21 schorsch Exp $";
+static const char	RCSid[] = "$Id: urand.c,v 2.11 2015/05/27 08:42:06 greg Exp $";
 #endif
 /*
  * Anticorrelated random function due to Christophe Schlick
@@ -7,8 +7,6 @@ static const char	RCSid[] = "$Id: urand.c,v 2.7 2003/0
 
 #include "copyright.h"
 
-#include  <stdlib.h>
-
 #include  "standard.h"
 #include  "random.h"
 
@@ -16,27 +14,33 @@ static const char	RCSid[] = "$Id: urand.c,v 2.7 2003/0
 
 #define  MAXORDER	(8*sizeof(unsigned short))
 
-unsigned short  *urperm = NULL;	/* urand() permutation */
-int  urmask;		/* bits used in permutation */
+static unsigned short  empty_tab = 0;
 
+unsigned short  *urperm = &empty_tab;	/* urand() permutation */
+int  urmask = 0;			/* bits used in permutation */
+
+
 int
-initurand(size)		/* initialize urand() for size entries */
-int  size;
+initurand(			/* initialize urand() for size entries */
+	int  size
+)
 {
 	int  order, n;
-	register int  i, offset;
+	int  i, offset;
 
-	if (urperm != NULL)
+	if ((urperm != NULL) & (urperm != &empty_tab))
 		free((void *)urperm);
 	if (--size <= 0) {
-		urperm = NULL;
+		empty_tab = 0;
+		urperm = &empty_tab;
 		urmask = 0;
 		return(0);
 	}
-	for (i = 1; size >>= 1; i++)
-		;
-	order = i>MAXORDER ? MAXORDER : i;
-	urmask = (1<<i) - 1;
+	for (i = 1; (size >>= 1); i++)
+		if (i == MAXORDER)
+			break;
+	order = i;
+	urmask = (1<<order) - 1;
 	urperm = (unsigned short *)malloc((urmask+1)*sizeof(unsigned short));
 	if (urperm == NULL) {
 		eputs("out of memory in initurand\n");
@@ -45,27 +49,27 @@ int  size;
 	urperm[0] = 0;
 	for (n = 1, offset = 1; n <= order; n++, offset <<= 1)
 		for (i = offset; i--; ) {
-			urperm[i] =
-			urperm[i+offset] = 2*urperm[i];
+			urperm[i+offset] = urperm[i] <<= 1;
 			if (random() & 0x4000)
 				urperm[i]++;
 			else
 				urperm[i+offset]++;
 		}
-	return(1<<order);
+	return(urmask+1);
 }
 
 
 int
-ilhash(d, n)			/* hash a set of integer values */
-register int  *d;
-register int  n;
+ilhash(				/* hash a set of integer values */
+	int  *d,
+	int  n
+)
 {
-	static int  tab[8] = {13623,353,1637,5831,2314,3887,5832,8737};
-	register int  hval;
+	static int  tab[8] = {103699,96289,73771,65203,81119,87037,92051,98899};
+	int  hval;
 
 	hval = 0;
 	while (n-- > 0)
-		hval += *d++ * tab[n&7];
-	return(hval);
+		hval ^= *d++ * tab[n&7];
+	return(hval & 0x7fffffff);
 }