--- ray/src/common/standard.h	2003/02/22 02:07:22	2.16
+++ ray/src/common/standard.h	2003/03/27 16:33:39	2.21
@@ -1,64 +1,9 @@
-/* RCSid: $Id: standard.h,v 2.16 2003/02/22 02:07:22 greg Exp $ */
+/* RCSid $Id: standard.h,v 2.21 2003/03/27 16:33:39 greg Exp $ */
 /*
  *	Miscellaneous definitions required by many routines.
  */
 
-/* ====================================================================
- * 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  <stdio.h>
 
@@ -142,11 +87,11 @@ extern double	tcos();			/* table-based cosine approxim
 #define  ttan(x)		(tsin(x)/tcos(x))
 #endif
 					/* custom version of assert(3) */
-#define  CHECK(be,et,em)	((be) ? error(et,em) : 0)
+#define  CHECK(be,et,em)	if (be) error(et,em); else
 #ifdef  DEBUG
 #define  DCHECK			CHECK
 #else
-#define  DCHECK(be,et,em)	0
+#define  DCHECK(be,et,em)	(void)0
 #endif
 					/* memory operations */
 #ifdef	NOSTRUCTASS
@@ -225,6 +170,10 @@ extern int	xf();
 extern int	invxf();
 extern int	fullxf();
 extern int	quadtratic();
+extern int4	encodedir();
+extern void	decodedir();
+extern double	dir2diff();
+extern double	fdir2diff();
 extern void	eputs();
 extern void	wputs();
 extern void	quit();
@@ -274,7 +223,7 @@ extern int	readbuf(int fd, char *bpos, int siz);
 extern int	writebuf(int fd, char *bpos, int siz);
 					/* defined in rexpr.c */
 extern int	ecompile(char *sp, int iflg, int wflag);
-extern char	*expsave();
+extern char	*expsave(void);
 extern void	expset(char *ep);
 extern char	*eindex(char *sp);
 					/* defined in savestr.c */
@@ -306,6 +255,11 @@ extern int	invxf(XF *ret, int ac, char *av[]);
 extern int	fullxf(FULLXF *fx, int ac, char *av[]);
 					/* defined in zeroes.c */
 extern int	quadtratic(double *r, double a, double b, double c);
+					/* defined in dircode.c */
+extern int4	encodedir(FVECT dv);
+extern void	decodedir(FVECT dv, int4 dc);
+extern double	dir2diff(int4 dc1, int4 dc2);
+extern double	fdir2diff(int4 dc1, FVECT v2);
 					/* miscellaneous */
 extern void	eputs(char *s);
 extern void	wputs(char *s);