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

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.8 by schorsch, Tue Mar 30 16:13:01 2004 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"
66 –
11   #include  "data.h"
68 –
12   #include  "func.h"
13 + #include  "rtotypes.h"
14  
15   /*
16   *      A stored pattern can either be brightness or
# Line 102 | Line 46 | static const char      RCSid[] = "$Id$";
46   */
47  
48  
49 < p_bdata(m, r)                   /* interpolate brightness data */
50 < register OBJREC  *m;
51 < RAY  *r;
49 > extern int
50 > p_bdata(                        /* interpolate brightness data */
51 >        register OBJREC  *m,
52 >        RAY  *r
53 > )
54   {
55          double  bval;
56          double  pt[MAXDIM];
# Line 121 | Line 67 | RAY  *r;
67          errno = 0;
68          for (i = dp->nd; i-- > 0; ) {
69                  pt[i] = evalue(mf->ep[i]);
70 <                if (errno)
70 >                if (errno == EDOM || errno == ERANGE)
71                          goto computerr;
72          }
73          bval = datavalue(dp, pt);
74          errno = 0;
75          bval = funvalue(m->oargs.sarg[0], 1, &bval);
76 <        if (errno)
76 >        if (errno == EDOM || errno == ERANGE)
77                  goto computerr;
78          scalecolor(r->pcol, bval);
79          return(0);
# Line 137 | Line 83 | computerr:
83   }
84  
85  
86 < p_cdata(m, r)                   /* interpolate color data */
87 < register OBJREC  *m;
88 < RAY  *r;
86 > extern int
87 > p_cdata(                        /* interpolate color data */
88 >        register OBJREC  *m,
89 >        RAY  *r
90 > )
91   {
92          double  col[3];
93          COLOR  cval;
# Line 158 | Line 106 | RAY  *r;
106          errno = 0;
107          for (i = 0; i < nv; i++) {
108                  pt[i] = evalue(mf->ep[i]);
109 <                if (errno)
109 >                if (errno == EDOM || errno == ERANGE)
110                          goto computerr;
111          }
112          col[0] = datavalue(dp, pt);
# Line 174 | Line 122 | RAY  *r;
122                          colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
123                  else
124                          colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
125 <        if (errno)
125 >        if (errno == EDOM || errno == ERANGE)
126                  goto computerr;
127          multcolor(r->pcol, cval);
128          return(0);
# Line 184 | Line 132 | computerr:
132   }
133  
134  
135 < p_pdata(m, r)                   /* interpolate picture data */
136 < register OBJREC  *m;
137 < RAY  *r;
135 > extern int
136 > p_pdata(                        /* interpolate picture data */
137 >        register OBJREC  *m,
138 >        RAY  *r
139 > )
140   {
141          double  col[3];
142          COLOR  cval;
# Line 202 | Line 152 | RAY  *r;
152          errno = 0;
153          pt[1] = evalue(mf->ep[0]);      /* y major ordering */
154          pt[0] = evalue(mf->ep[1]);
155 <        if (errno)
155 >        if (errno == EDOM || errno == ERANGE)
156                  goto computerr;
157          dp = getpict(m->oargs.sarg[3]);
158          for (i = 0; i < 3; i++)
# Line 213 | Line 163 | RAY  *r;
163                          colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
164                  else
165                          colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
166 <        if (errno)
166 >        if (errno == EDOM || errno == ERANGE)
167                  goto computerr;
168          multcolor(r->pcol, cval);
169          return(0);

Diff Legend

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