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.9 by gwlarson, Mon Jan 25 11:51:37 1999 UTC vs.
Revision 3.10 by greg, Sat Feb 22 02:07:27 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1997 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Input and output conditioning routines for pcond.
6 + *  Added white-balance adjustment 10/01 (GW).
7   */
8  
9   #include "pcond.h"
# Line 67 | Line 65 | nextscan()                             /* read and condition next scanline */
65          if (nread >= numscans(&inpres)) {
66                  if (cwarpfile != NULL)
67                          free3dw(cwarp);
68 <                free((char *)scanbuf);
68 >                free((void *)scanbuf);
69                  return(scanbuf = NULL);
70          }
71          if (what2do&DO_ACUITY)
# Line 106 | Line 104 | firstscan()                            /* return first processed scanline */
104                          syserror(cwarpfile);
105          } else
106                  if (lumf == rgblum)
107 <                        comprgb2rgbmat(mbcond.cmat, inprims, outprims);
107 >                        comprgb2rgbWBmat(mbcond.cmat, inprims, outprims);
108                  else
109 <                        compxyz2rgbmat(mbcond.cmat, outprims);
109 >                        compxyz2rgbWBmat(mbcond.cmat, outprims);
110          if (what2do&DO_ACUITY)
111                  initacuity();
112          scanbuf = (COLOR *)malloc(scanlen(&inpres)*sizeof(COLOR));

Diff Legend

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