--- ray/src/common/tmapluv.c	2003/07/01 16:20:04	3.7
+++ ray/src/common/tmapluv.c	2003/07/27 22:12:01	3.9
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: tmapluv.c,v 3.7 2003/07/01 16:20:04 greg Exp $";
+static const char	RCSid[] = "$Id: tmapluv.c,v 3.9 2003/07/27 22:12:01 schorsch Exp $";
 #endif
 /*
  * Routines for tone-mapping LogLuv encoded pixels.
@@ -136,7 +136,7 @@ int	len;
 					/* check arguments */
 	if (tmTop == NULL)
 		returnErr(TM_E_TMINVAL);
-	if (ls == NULL | luvs == NULL | len < 0)
+	if ((ls == NULL) | (luvs == NULL) | (len < 0))
 		returnErr(TM_E_ILLEGAL);
 					/* check package registration */
 	if (luv32Reg < 0) {
@@ -196,7 +196,7 @@ int	len;
 					/* check arguments */
 	if (tmTop == NULL)
 		returnErr(TM_E_TMINVAL);
-	if (ls == NULL | luvs == NULL | len < 0)
+	if ((ls == NULL) | (luvs == NULL) | (len < 0))
 		returnErr(TM_E_ILLEGAL);
 					/* check package registration */
 	if (luv24Reg < 0) {
@@ -215,7 +215,7 @@ int	len;
 			continue;
 						/* get chrominance */
 		if (tmTop->flags & TM_F_MESOPIC && ls[i] < BMESUPPER) {
-			if (uv_decode(uvp, uvp+1, luvs[i]&0x3fff) < 0) {
+			if (uv_decode(&uvp[0], &uvp[1], luvs[i]&0x3fff) < 0) {
 				uvp[0] = U_NEU;		/* should barf? */
 				uvp[1] = V_NEU;
 			}
@@ -256,7 +256,7 @@ int	len;
 					/* check arguments */
 	if (tmTop == NULL)
 		returnErr(TM_E_TMINVAL);
-	if (ls == NULL | l16s == NULL | len < 0)
+	if ((ls == NULL) | (l16s == NULL) | (len < 0))
 		returnErr(TM_E_ILLEGAL);
 					/* check scaling offset */
 	if (!FEQ(tmTop->inpsf, lastsf)) {