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

Comparing ray/src/common/tmap16bit.c (file contents):
Revision 1.3 by greg, Tue Jul 15 07:28:09 2003 UTC vs.
Revision 1.4 by schorsch, Sun Jul 27 22:12:01 2003 UTC

# Line 141 | Line 141 | tmCvGray16(TMbright *ls, uint16 *scan, int len, double
141  
142          if (tmTop == NULL)
143                  returnErr(TM_E_TMINVAL);
144 <        if (ls == NULL | scan == NULL | len < 0)
144 >        if ((ls == NULL) | (scan == NULL) | (len < 0))
145                  returnErr(TM_E_ILLEGAL);
146          if (gv <= 0.)
147                  gv = DEFGAM;
# Line 179 | Line 179 | tmCvRGB48(TMbright *ls, BYTE *cs, uint16 (*scan)[3], i
179  
180          if (tmTop == NULL)
181                  returnErr(TM_E_TMINVAL);
182 <        if (ls == NULL | scan == NULL | len < 0)
182 >        if ((ls == NULL) | (scan == NULL) | (len < 0))
183                  returnErr(TM_E_ILLEGAL);
184          if (gv <= 0.)
185                  gv = DEFGAM;
186                                                  /* sync input gamma table */
187 <        if (gv != 1. & gv != cur_gam)
187 >        if ((gv != 1.) & (gv != cur_gam))
188                  mkGamTable(gv);
189          if (tmNeedMatrix(tmTop)) {              /* need floating point */
190                  COLOR   *newscan;

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)