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

Comparing ray/src/px/pcond2.c (file contents):
Revision 3.17 by greg, Thu Sep 8 22:29:47 2005 UTC vs.
Revision 3.18 by greg, Fri Aug 21 05:48:28 2015 UTC

# Line 38 | Line 38 | static void cwscan(COLOR *sl, int len, WARP3D *wp);
38   static void getmbcalfile(char *fn, struct mbc *mb);
39  
40  
41 < extern double
41 > double
42   rgblum(         /* compute (scotopic) luminance of RGB color */
43          COLOR   clr,
44          int     scotopic
# Line 53 | Line 53 | rgblum(                /* compute (scotopic) luminance of RGB color
53   }
54  
55  
56 < extern double
56 > double
57   cielum(         /* compute (scotopic) luminance of CIE color */
58          COLOR   xyz,
59          int     scotopic
# Line 67 | Line 67 | cielum(                /* compute (scotopic) luminance of CIE color
67   }
68  
69  
70 < extern COLOR *
70 > COLOR *
71   nextscan(void)                          /* read and condition next scanline */
72   {
73          if (nread >= numscans(&inpres)) {
# Line 102 | Line 102 | nextscan(void)                         /* read and condition next scanline
102   }
103  
104  
105 < extern COLOR *
105 > COLOR *
106   firstscan(void)                         /* return first processed scanline */
107   {
108          if (mbcalfile != NULL)          /* load macbethcal file */
# Line 127 | Line 127 | firstscan(void)                                /* return first processed scanline
127  
128   static void
129   sfscan(                 /* apply scalefactor to scanline */
130 <        register COLOR  *sl,
130 >        COLOR   *sl,
131          int     len,
132          double  sf
133   )
# Line 159 | Line 159 | greypoint(                     /* compute gamut mapping grey target */
159  
160   static void
161   matscan(                        /* apply color matrix to scaline */
162 <        register COLOR  *sl,
162 >        COLOR   *sl,
163          int     len,
164          COLORMAT        mat
165   )
# Line 176 | Line 176 | static void
176   mbscan(                 /* apply macbethcal adj. to scaline */
177          COLOR   *sl,
178          int     len,
179 <        register struct mbc     *mb
179 >        struct mbc      *mb
180   )
181   {
182          double  d;
183 <        register int    i, j;
183 >        int     i, j;
184  
185          while (len--) {
186                  colortrans(sl[0], mb->cmat, sl[0]);
# Line 225 | Line 225 | cwscan(                        /* apply color space warp to scaline */
225   static void
226   getmbcalfile(                   /* load macbethcal file */
227          char    *fn,
228 <        register struct mbc     *mb
228 >        struct mbc      *mb
229   )
230   {
231          char    buf[128];
232          FILE    *fp;
233          int     inpflags = 0;
234 <        register int    i;
234 >        int     i;
235  
236          if ((fp = fopen(fn, "r")) == NULL)
237                  syserror(fn);

Diff Legend

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