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

Comparing ray/src/common/color.c (file contents):
Revision 2.16 by greg, Wed Feb 9 00:00:17 2005 UTC vs.
Revision 2.17 by greg, Sat May 31 20:13:31 2014 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   #include "copyright.h"
11  
12   #include  <stdio.h>
13 –
13   #include  <stdlib.h>
15 –
14   #include  <math.h>
17 –
15   #include  "color.h"
16  
17   #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
# Line 30 | Line 27 | static const char      RCSid[] = "$Id$";
27  
28  
29   char *
30 < tempbuffer(len)                 /* get a temporary buffer */
31 < unsigned int  len;
30 > tempbuffer(                     /* get a temporary buffer */
31 >        unsigned int  len
32 > )
33   {
34          static char  *tempbuf = NULL;
35          static unsigned  tempbuflen = 0;
# Line 48 | Line 46 | unsigned int  len;
46  
47  
48   int
49 < fwritecolrs(scanline, len, fp)          /* write out a colr scanline */
50 < register COLR  *scanline;
51 < int  len;
52 < register FILE  *fp;
49 > fwritecolrs(                    /* write out a colr scanline */
50 >        COLR  *scanline,
51 >        int  len,
52 >        FILE  *fp
53 > )
54   {
55 <        register int  i, j, beg, cnt = 1;
55 >        int  i, j, beg, cnt = 1;
56          int  c2;
57          
58          if ((len < MINELEN) | (len > MAXELEN))  /* OOBs, write out flat */
# Line 101 | Line 100 | register FILE  *fp;
100  
101  
102   static int
103 < oldreadcolrs(scanline, len, fp)         /* read in an old colr scanline */
104 < register COLR  *scanline;
105 < int  len;
106 < register FILE  *fp;
103 > oldreadcolrs(                   /* read in an old colr scanline */
104 >        COLR  *scanline,
105 >        int  len,
106 >        FILE  *fp
107 > )
108   {
109          int  rshift;
110 <        register int  i;
110 >        int  i;
111          
112          rshift = 0;
113          
# Line 138 | Line 138 | register FILE  *fp;
138  
139  
140   int
141 < freadcolrs(scanline, len, fp)           /* read in an encoded colr scanline */
142 < register COLR  *scanline;
143 < int  len;
144 < register FILE  *fp;
141 > freadcolrs(                     /* read in an encoded colr scanline */
142 >        COLR  *scanline,
143 >        int  len,
144 >        FILE  *fp
145 > )
146   {
147 <        register int  i, j;
147 >        int  i, j;
148          int  code, val;
149                                          /* determine scanline type */
150          if ((len < MINELEN) | (len > MAXELEN))
# Line 193 | Line 194 | register FILE  *fp;
194  
195  
196   int
197 < fwritescan(scanline, len, fp)           /* write out a scanline */
198 < register COLOR  *scanline;
199 < int  len;
200 < FILE  *fp;
197 > fwritescan(                     /* write out a scanline */
198 >        COLOR  *scanline,
199 >        int  len,
200 >        FILE  *fp
201 > )
202   {
203          COLR  *clrscan;
204          int  n;
205 <        register COLR  *sp;
205 >        COLR  *sp;
206                                          /* get scanline buffer */
207          if ((sp = (COLR *)tempbuffer(len*sizeof(COLR))) == NULL)
208                  return(-1);
# Line 219 | Line 221 | FILE  *fp;
221  
222  
223   int
224 < freadscan(scanline, len, fp)            /* read in a scanline */
225 < register COLOR  *scanline;
226 < int  len;
227 < FILE  *fp;
224 > freadscan(                      /* read in a scanline */
225 >        COLOR  *scanline,
226 >        int  len,
227 >        FILE  *fp
228 > )
229   {
230 <        register COLR  *clrscan;
230 >        COLR  *clrscan;
231  
232          if ((clrscan = (COLR *)tempbuffer(len*sizeof(COLR))) == NULL)
233                  return(-1);
# Line 247 | Line 250 | FILE  *fp;
250  
251  
252   void
253 < setcolr(clr, r, g, b)           /* assign a short color value */
254 < register COLR  clr;
255 < double  r, g, b;
253 > setcolr(                        /* assign a short color value */
254 >        COLR  clr,
255 >        double  r,
256 >        double  g,
257 >        double  b
258 > )
259   {
260          double  d;
261          int  e;
# Line 283 | Line 289 | double  r, g, b;
289  
290  
291   void
292 < colr_color(col, clr)            /* convert short to float color */
293 < register COLOR  col;
294 < register COLR  clr;
292 > colr_color(                     /* convert short to float color */
293 >        COLOR  col,
294 >        COLR  clr
295 > )
296   {
297          double  f;
298          
# Line 301 | Line 308 | register COLR  clr;
308  
309  
310   int
311 < bigdiff(c1, c2, md)                     /* c1 delta c2 > md? */
312 < register COLOR  c1, c2;
313 < double  md;
311 > bigdiff(                                /* c1 delta c2 > md? */
312 >        COLOR  c1,
313 >        COLOR  c2,
314 >        double  md
315 > )
316   {
317 <        register int  i;
317 >        int  i;
318  
319          for (i = 0; i < 3; i++)
320                  if (colval(c1,i)-colval(c2,i) > md*colval(c2,i) ||

Diff Legend

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