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

Comparing ray/src/common/colrops.c (file contents):
Revision 2.7 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.11 by schorsch, Wed Jul 30 10:11:06 2003 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include "copyright.h"
9  
10 + #include <stdio.h>
11   #include <math.h>
12 +
13 + #include "rtmisc.h"
14   #include "color.h"
15  
13 – #define NULL            0
16  
15 – extern char     *bmalloc();
16 –
17   #define MAXGSHIFT       31              /* maximum shift for gamma table */
18  
19   static BYTE     *g_mant = NULL, *g_nexp = NULL;
# Line 23 | Line 23 | static BYTE    (*g_bval)[256] = NULL;
23  
24   int
25   setcolrcor(f, a2)               /* set brightness correction */
26 < double  (*f)();
26 > double  (*f)(double,double);
27   double  a2;
28   {
29          double  mult;
# Line 45 | Line 45 | double a2;
45  
46   int
47   setcolrinv(f, a2)               /* set inverse brightness correction */
48 < double  (*f)();
48 > double  (*f)(double,double);
49   double  a2;
50   {
51          double  mult;
# Line 136 | Line 136 | int    len;
136   {
137          register int    nexpo;
138  
139 <        if (g_mant == NULL | g_nexp == NULL)
139 >        if ((g_mant == NULL) | (g_nexp == NULL))
140                  return(-1);
141          while (len-- > 0) {
142                  nexpo = g_nexp[scan[0][RED]];

Diff Legend

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