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

Comparing ray/src/common/tmaptiff.c (file contents):
Revision 3.3 by greg, Mon Jul 14 04:56:54 2003 UTC vs.
Revision 3.4 by schorsch, Sun Jul 27 22:12:01 2003 UTC

# Line 94 | Line 94 | tmLoadTIFF(TMbright **lpp, BYTE **cpp, int *xp, int *y
94                                          /* check arguments */
95          if (tmTop == NULL)
96                  returnErr(TM_E_TMINVAL);
97 <        if (lpp == NULL | xp == NULL | yp == NULL |
98 <                        (fname == NULL & tp == NULL))
97 >        if ((lpp == NULL) | (xp == NULL) | (yp == NULL) |
98 >                        ((fname == NULL) & (tp == NULL)))
99                  returnErr(TM_E_ILLEGAL);
100                                          /* check/get TIFF tags */
101          sl.p = NULL; *lpp = NULL;
# Line 160 | Line 160 | tmLoadTIFF(TMbright **lpp, BYTE **cpp, int *xp, int *y
160                  goto done;
161          }
162          *lpp = (TMbright *)malloc(width*height*sizeof(TMbright));
163 <        if (sl.p == NULL | *lpp == NULL) {
163 >        if ((sl.p == NULL) | (*lpp == NULL)) {
164                  err = TM_E_NOMEM;
165                  goto done;
166          }
# Line 257 | Line 257 | tmMapTIFF(BYTE **psp, int *xp, int *yp, int flags, RGB
257          BYTE    *cp;
258          int     err;
259                                          /* check arguments */
260 <        if (psp == NULL | xp == NULL | yp == NULL | monpri == NULL |
261 <                        (fname == NULL & tp == NULL))
260 >        if ((psp == NULL) | (xp == NULL) | (yp == NULL) | (monpri == NULL) |
261 >                        ((fname == NULL) & (tp == NULL)))
262                  returnErr(TM_E_ILLEGAL);
263          if (gamval < MINGAM) gamval = DEFGAM;
264          if (Lddyn < MINLDDYN) Lddyn = DEFLDDYN;

Diff Legend

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