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

Comparing ray/src/rt/data.h (file contents):
Revision 1.2 by greg, Tue Apr 3 17:24:33 1990 UTC vs.
Revision 2.4 by greg, Sat Feb 22 02:07:28 2003 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1986 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid: $Id$ */
2   /*
3 < *  data.h - header file for routines which interpolate data.
3 > * Header for data file loading and computation routines.
4 > */
5 >
6 > /* ====================================================================
7 > * The Radiance Software License, Version 1.0
8   *
9 < *     6/4/86
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   */
62  
63 < #define  MAXDIM         8               /* maximum dimensions for data array */
63 > #define  MAXDDIM        5               /* maximum data dimensions */
64  
65   #define  DATATYPE       float           /* single precision to save space */
66 + #define  DATATY         'f'             /* format for DATATYPE */
67  
15 #define  DSCANF         "%f"            /* scan format for DATATYPE */
16
68   typedef struct datarray {
69          char  *name;                    /* name of our data */
70 <        int  nd;                        /* number of dimensions */
70 >        short  type;                    /* DATATY, RED, GRN or BLU */
71 >        short  nd;                      /* number of dimensions */
72          struct {
73 <                double  org, siz;               /* coordinate domain */
73 >                DATATYPE  org, siz;             /* coordinate domain */
74                  int  ne;                        /* number of elements */
75 <                double  *p;                     /* point locations */
76 <        } dim[MAXDIM];                  /* dimension specifications */
77 <        DATATYPE  *arr;                 /* the data */
75 >                DATATYPE  *p;                   /* point locations */
76 >        } dim[MAXDDIM];                 /* dimension specifications */
77 >        union {
78 >                DATATYPE  *d;                   /* float data */
79 >                COLR  *c;                       /* RGB data */
80 >        }  arr;                         /* the data */
81          struct datarray  *next;         /* next array in list */
82   } DATARRAY;                     /* a data array */
83  
84 < extern DATARRAY  *getdata(), *getpict();
84 > #ifdef NOPROTO
85  
86 < extern double  datavalue();
86 > extern DATARRAY *getdata();
87 > extern DATARRAY *getpict();
88 > extern void     freedata();
89 > extern double   datavalue();
90 >
91 > #else
92 >
93 > extern DATARRAY *getdata(char *dname);
94 > extern DATARRAY *getpict(char *pname);
95 > extern void     freedata(DATARRAY *dta);
96 > extern double   datavalue(DATARRAY *dp, double *pt);
97 >
98 > #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines