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

Comparing ray/src/rt/pmap.h (file contents):
Revision 2.1 by greg, Tue Feb 24 19:39:26 2015 UTC vs.
Revision 2.3 by rschregle, Fri May 8 13:20:22 2015 UTC

# Line 4 | Line 4
4  
5     Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
6     (c) Fraunhofer Institute for Solar Energy Systems,
7 <       Lucerne University of Applied Sciences & Arts  
7 >   (c) Lucerne University of Applied Sciences and Arts,
8 >   supported by the Swiss National Science Foundation (SNSF, #147053)
9     ==================================================================
10    
11     $Id$
# Line 18 | Line 19
19     #include "pmapdata.h"
20  
21  
22 <
23 <   #define min(a, b) ((a) < (b) ? (a) : (b))
24 <   #define max(a, b) ((a) > (b) ? (a) : (b))
22 >   #ifndef min
23 >      #define min(a, b) ((a) < (b) ? (a) : (b))
24 >   #endif
25 >  
26 >   #ifndef max
27 >      #define max(a, b) ((a) > (b) ? (a) : (b))
28 >   #endif
29 >  
30     #define sqr(a)    ((a) * (a))
31  
32     /* Average over colour channels */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines