ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/p_data.c

Comparing ray/src/rt/p_data.c (file contents):
Revision 2.5 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.7 by greg, Wed Mar 5 16:16:53 2003 UTC

#	Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5		*  p_data.c - routine for stored patterns.
6		*/
7
8	<	/* ====================================================================
9	<	* The Radiance Software License, Version 1.0
10	<	*
11	<	* Copyright (c) 1990 - 2002 The Regents of the University of California,
12	<	* through Lawrence Berkeley National Laboratory.   All rights reserved.
13	<	*
14	<	* Redistribution and use in source and binary forms, with or without
15	<	* modification, are permitted provided that the following conditions
16	<	* are met:
17	<	*
18	<	* 1. Redistributions of source code must retain the above copyright
19	<	*         notice, this list of conditions and the following disclaimer.
20	<	*
21	<	* 2. Redistributions in binary form must reproduce the above copyright
22	<	*       notice, this list of conditions and the following disclaimer in
23	<	*       the documentation and/or other materials provided with the
24	<	*       distribution.
25	<	*
26	<	* 3. The end-user documentation included with the redistribution,
27	<	*           if any, must include the following acknowledgment:
28	<	*             "This product includes Radiance software
29	<	*                 (http://radsite.lbl.gov/)
30	<	*                 developed by the Lawrence Berkeley National Laboratory
31	<	*               (http://www.lbl.gov/)."
32	<	*       Alternately, this acknowledgment may appear in the software itself,
33	<	*       if and wherever such third-party acknowledgments normally appear.
34	<	*
35	<	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36	<	*       and "The Regents of the University of California" must
37	<	*       not be used to endorse or promote products derived from this
38	<	*       software without prior written permission. For written
39	<	*       permission, please contact [email protected].
40	<	*
41	<	* 5. Products derived from this software may not be called "Radiance",
42	<	*       nor may "Radiance" appear in their name, without prior written
43	<	*       permission of Lawrence Berkeley National Laboratory.
44	<	*
45	<	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46	<	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47	<	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48	<	* DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49	<	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50	<	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51	<	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52	<	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53	<	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54	<	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55	<	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56	<	* SUCH DAMAGE.
57	<	* ====================================================================
58	<	*
59	<	* This software consists of voluntary contributions made by many
60	<	* individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61	<	* information on Lawrence Berkeley National Laboratory, please see
62	<	* <http://www.lbl.gov/>.
63	<	*/
8	>	#include "copyright.h"
9
10		#include  "ray.h"
11
#	Line 121 | Line 66 | RAY  *r;
66		errno = 0;
67		for (i = dp->nd; i-- > 0; ) {
68		pt[i] = evalue(mf->ep[i]);
69	<	if (errno)
69	>	if (errno == EDOM || errno == ERANGE)
70		goto computerr;
71		}
72		bval = datavalue(dp, pt);
73		errno = 0;
74		bval = funvalue(m->oargs.sarg[0], 1, &bval);
75	<	if (errno)
75	>	if (errno == EDOM || errno == ERANGE)
76		goto computerr;
77		scalecolor(r->pcol, bval);
78		return(0);
#	Line 158 | Line 103 | RAY  *r;
103		errno = 0;
104		for (i = 0; i < nv; i++) {
105		pt[i] = evalue(mf->ep[i]);
106	<	if (errno)
106	>	if (errno == EDOM || errno == ERANGE)
107		goto computerr;
108		}
109		col[0] = datavalue(dp, pt);
#	Line 174 | Line 119 | RAY  *r;
119		colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
120		else
121		colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
122	<	if (errno)
122	>	if (errno == EDOM || errno == ERANGE)
123		goto computerr;
124		multcolor(r->pcol, cval);
125		return(0);
#	Line 202 | Line 147 | RAY  *r;
147		errno = 0;
148		pt[1] = evalue(mf->ep[0]);      /* y major ordering */
149		pt[0] = evalue(mf->ep[1]);
150	<	if (errno)
150	>	if (errno == EDOM || errno == ERANGE)
151		goto computerr;
152		dp = getpict(m->oargs.sarg[3]);
153		for (i = 0; i < 3; i++)
#	Line 213 | Line 158 | RAY  *r;
158		colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
159		else
160		colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
161	<	if (errno)
161	>	if (errno == EDOM || errno == ERANGE)
162		goto computerr;
163		multcolor(r->pcol, cval);
164		return(0);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)