--- ray/src/rt/mx_data.c	2003/02/22 02:07:28	2.6
+++ ray/src/rt/mx_data.c	2023/11/15 18:02:53	2.11
@@ -1,72 +1,16 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: mx_data.c,v 2.6 2003/02/22 02:07:28 greg Exp $";
+static const char	RCSid[] = "$Id: mx_data.c,v 2.11 2023/11/15 18:02:53 greg Exp $";
 #endif
 /*
  *  mx_data.c - routine for stored mixtures.
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
 #include  "ray.h"
-
 #include  "data.h"
-
 #include  "func.h"
+#include  "rtotypes.h"
 
 /*
  *  A stored mixture is specified:
@@ -97,17 +41,19 @@ static const char	RCSid[] = "$Id: mx_data.c,v 2.6 2003
  */
 
 
-mx_data(m, r)			/* interpolate mixture data */
-register OBJREC  *m;
-RAY  *r;
+int
+mx_data(			/* interpolate mixture data */
+	OBJREC  *m,
+	RAY  *r
+)
 {
 	OBJECT	obj;
 	double  coef;
-	double  pt[MAXDIM];
+	double  pt[MAXDDIM];
 	DATARRAY  *dp;
 	OBJECT  mod[2];
-	register MFUNC  *mf;
-	register int  i;
+	MFUNC  *mf;
+	int  i;
 
 	if (m->oargs.nsargs < 6)
 		objerror(m, USER, "bad # arguments");
@@ -127,13 +73,13 @@ RAY  *r;
 	errno = 0;
 	for (i = 0; i < dp->nd; i++) {
 		pt[i] = evalue(mf->ep[i]);
-		if (errno)
+		if (errno == EDOM || errno == ERANGE)
 			goto computerr;
 	}
 	coef = datavalue(dp, pt);
 	errno = 0;
 	coef = funvalue(m->oargs.sarg[2], 1, &coef);
-	if (errno)
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	if (raymixture(r, mod[0], mod[1], coef)) {
 		if (m->omod != OVOID)
@@ -147,17 +93,19 @@ computerr:
 }
 
 
-mx_pdata(m, r)			/* interpolate mixture picture */
-register OBJREC  *m;
-RAY  *r;
+int
+mx_pdata(			/* interpolate mixture picture */
+	OBJREC  *m,
+	RAY  *r
+)
 {
 	OBJECT	obj;
 	double	col[3], coef;
-	double  pt[MAXDIM];
+	double  pt[MAXDDIM];
 	DATARRAY  *dp;
 	OBJECT  mod[2];
-	register MFUNC  *mf;
-	register int  i;
+	MFUNC  *mf;
+	int  i;
 
 	if (m->oargs.nsargs < 7)
 		objerror(m, USER, "bad # arguments");
@@ -176,13 +124,13 @@ RAY  *r;
 	errno = 0;
 	pt[1] = evalue(mf->ep[0]);	/* y major ordering */
 	pt[0] = evalue(mf->ep[1]);
-	if (errno)
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	for (i = 0; i < 3; i++)		/* get pixel from picture */
 		col[i] = datavalue(dp+i, pt);
 	errno = 0;			/* evaluate function on pixel */
 	coef = funvalue(m->oargs.sarg[2], 3, col);
-	if (errno)
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	if (raymixture(r, mod[0], mod[1], coef)) {
 		if (m->omod != OVOID)