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

Comparing ray/src/util/rcomb.c (file contents):
Revision 2.3 by greg, Tue Dec 19 00:39:03 2023 UTC vs.
Revision 2.5 by greg, Tue Dec 19 20:38:38 2023 UTC

# Line 284 | Line 284 | checksymbolic(ROPMAT *rop)
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)
# Line 592 | Line 592 | combine_input(ROPMAT *res, FILE *fout)
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);

Diff Legend

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