ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/standard.h
(Generate patch)

Comparing ray/src/common/standard.h (file contents):
Revision 2.16 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.22 by greg, Tue May 13 17:58:32 2003 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *      Miscellaneous definitions required by many routines.
4   */
5  
6 < /* ====================================================================
7 < * The Radiance Software License, Version 1.0
8 < *
9 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
10 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
11 < *
12 < * Redistribution and use in source and binary forms, with or without
13 < * modification, are permitted provided that the following conditions
14 < * are met:
15 < *
16 < * 1. Redistributions of source code must retain the above copyright
17 < *         notice, this list of conditions and the following disclaimer.
18 < *
19 < * 2. Redistributions in binary form must reproduce the above copyright
20 < *       notice, this list of conditions and the following disclaimer in
21 < *       the documentation and/or other materials provided with the
22 < *       distribution.
23 < *
24 < * 3. The end-user documentation included with the redistribution,
25 < *           if any, must include the following acknowledgment:
26 < *             "This product includes Radiance software
27 < *                 (http://radsite.lbl.gov/)
28 < *                 developed by the Lawrence Berkeley National Laboratory
29 < *               (http://www.lbl.gov/)."
30 < *       Alternately, this acknowledgment may appear in the software itself,
31 < *       if and wherever such third-party acknowledgments normally appear.
32 < *
33 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
34 < *       and "The Regents of the University of California" must
35 < *       not be used to endorse or promote products derived from this
36 < *       software without prior written permission. For written
37 < *       permission, please contact [email protected].
38 < *
39 < * 5. Products derived from this software may not be called "Radiance",
40 < *       nor may "Radiance" appear in their name, without prior written
41 < *       permission of Lawrence Berkeley National Laboratory.
42 < *
43 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
44 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
45 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
47 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
49 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
50 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
51 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
52 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
53 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 < * SUCH DAMAGE.
55 < * ====================================================================
56 < *
57 < * This software consists of voluntary contributions made by many
58 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
59 < * information on Lawrence Berkeley National Laboratory, please see
60 < * <http://www.lbl.gov/>.
61 < */
6 > #include "copyright.h"
7  
8   #include  <stdio.h>
9  
# Line 142 | Line 87 | extern double  tcos();                 /* table-based cosine approxim
87   #define  ttan(x)                (tsin(x)/tcos(x))
88   #endif
89                                          /* custom version of assert(3) */
90 < #define  CHECK(be,et,em)        ((be) ? error(et,em) : 0)
90 > #define  CHECK(be,et,em)        if (be) error(et,em); else
91   #ifdef  DEBUG
92   #define  DCHECK                 CHECK
93   #else
94 < #define  DCHECK(be,et,em)       0
94 > #define  DCHECK(be,et,em)       (void)0
95   #endif
96                                          /* memory operations */
97   #ifdef  NOSTRUCTASS
98 < #define  copystruct(d,s)        bcopy((char *)(s),(char *)(d),sizeof(*(d)))
98 > #define  copystruct(d,s)        bcopy((void *)(s),(void *)(d),sizeof(*(d)))
99   #else
100   #define  copystruct(d,s)        (*(d) = *(s))
101   #endif
# Line 186 | Line 131 | extern char    *fgetword();
131   extern void     fputword();
132   extern char     *fixargv0();
133   extern FILE     *frlibopen();
134 < extern char     *getlibpath();
134 > extern char     *getrlibpath();
135   extern char     *getpath();
136   extern void     putstr();
137   extern void     putint();
# Line 225 | Line 170 | extern int     xf();
170   extern int      invxf();
171   extern int      fullxf();
172   extern int      quadtratic();
173 + extern int4     encodedir();
174 + extern void     decodedir();
175 + extern double   dir2diff();
176 + extern double   fdir2diff();
177   extern void     eputs();
178   extern void     wputs();
179   extern void     quit();
# Line 255 | Line 204 | extern char    *fixargv0(char *av0);
204                                          /* defined in fropen.c */
205   extern FILE     *frlibopen(char *fname);
206                                          /* defined in getlibpath.c */
207 < extern char     *getlibpath(void);
207 > extern char     *getrlibpath(void);
208                                          /* defined in getpath.c */
209   extern char     *getpath(char *fname, char *searchpath, int mode);
210                                          /* defined in portio.c */
# Line 274 | Line 223 | extern int     readbuf(int fd, char *bpos, int siz);
223   extern int      writebuf(int fd, char *bpos, int siz);
224                                          /* defined in rexpr.c */
225   extern int      ecompile(char *sp, int iflg, int wflag);
226 < extern char     *expsave();
226 > extern char     *expsave(void);
227   extern void     expset(char *ep);
228   extern char     *eindex(char *sp);
229                                          /* defined in savestr.c */
# Line 306 | Line 255 | extern int     invxf(XF *ret, int ac, char *av[]);
255   extern int      fullxf(FULLXF *fx, int ac, char *av[]);
256                                          /* defined in zeroes.c */
257   extern int      quadtratic(double *r, double a, double b, double c);
258 +                                        /* defined in dircode.c */
259 + extern int4     encodedir(FVECT dv);
260 + extern void     decodedir(FVECT dv, int4 dc);
261 + extern double   dir2diff(int4 dc1, int4 dc2);
262 + extern double   fdir2diff(int4 dc1, FVECT v2);
263                                          /* miscellaneous */
264   extern void     eputs(char *s);
265   extern void     wputs(char *s);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines