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

Comparing ray/src/common/tmapcolrs.c (file contents):
Revision 3.18 by greg, Fri Jan 7 21:41:06 2005 UTC vs.
Revision 3.20 by greg, Wed Feb 23 00:08:08 2005 UTC

# Line 197 | Line 197 | FILE   *fp
197                          ((fname == NULL) & (fp == TM_GETFILE)))
198                  returnErr(TM_E_ILLEGAL);
199          *xp = *yp = 0;                          /* error precaution */
200 <        if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "r")) == NULL)
200 >        if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "rb")) == NULL)
201                  returnErr(TM_E_BADFILE);
202          *lpp = NULL;
203          if (cpp != TM_NOCHROMP) *cpp = NULL;
# Line 214 | Line 214 | FILE   *fp
214          else if (info.format == FMTCIE)
215                  info.primp = TM_XYZPRIM;
216                                                  /* prepare library */
217 <        if ((err = tmSetSpace(tms, info.primp, 1./info.expos)) != TM_E_OK)
217 >        if ((err = tmSetSpace(tms, info.primp, 1./info.expos, NULL)) != TM_E_OK)
218                  goto done;
219          err = TM_E_NOMEM;                       /* allocate arrays */
220          *lpp = (TMbright *)malloc(sizeof(TMbright) * *xp * *yp);

Diff Legend

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