284 |
|
memcpy(rop->rmp->wlpart, WLPART, sizeof(rop->rmp->wlpart)); |
285 |
|
rop->rmp->ncomp = rop->preop.clen / nc; |
286 |
|
/* decide on output type */ |
287 |
< |
if (!strcmp(rop->preop.csym, "XYZ")) { |
287 |
> |
if (!strcasecmp(rop->preop.csym, "XYZ")) { |
288 |
|
if (dt <= DTspec) |
289 |
|
rop->rmp->dtype = DTxyze; |
290 |
< |
} else if (!strcmp(rop->preop.csym, "RGB")) { |
290 |
> |
} else if (!strcasecmp(rop->preop.csym, "RGB")) { |
291 |
|
if (dt <= DTspec) |
292 |
|
rop->rmp->dtype = DTrgbe; |
293 |
|
} else if (rop->rmp->dtype == DTspec) |
592 |
|
RMATRIX *mres = NULL; |
593 |
|
for (i = 0; i < nmats; i++) { |
594 |
|
if (!rmx_load_row(mop[i].imx.mtx, &mop[i].imx, mop[i].infp)) { |
595 |
< |
if (in_nrows <= 0) /* normal end? */ |
595 |
> |
if (cur_row > in_nrows) /* unknown #input rows? */ |
596 |
|
goto loop_exit; |
597 |
|
fprintf(stderr, "%s: read error at row %d\n", |
598 |
|
mop[i].inspec, cur_row); |