| 52 |
|
int len |
| 53 |
|
) |
| 54 |
|
{ |
| 55 |
< |
static char funcName[] = "tmCvColrs"; |
| 55 |
> |
static const char funcName[] = "tmCvColrs"; |
| 56 |
|
COLR cmon; |
| 57 |
|
register COLRDATA *cd; |
| 58 |
|
register int i, bi, li; |
| 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; |
| 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); |
