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

Comparing ray/src/util/rmtxcomb.c (file contents):
Revision 2.2 by greg, Tue Dec 5 20:05:36 2023 UTC vs.
Revision 2.3 by greg, Tue Dec 5 21:13:38 2023 UTC

# Line 552 | Line 552 | combine_input(ROPMAT *res, FILE *fout)
552                          goto memerror;
553          }
554          if (mcat && mcat_last &&
555 <                        !(tmp = rmx_new(1, res->imx.ncols, res->rmp->ncomp)))
555 >                        !(tmp = rmx_alloc(1, res->imx.ncols, res->rmp->ncomp)))
556                  goto memerror;
557          res->imx.nrows = 1;
558          if (!rmx_prepare(&res->imx))
# Line 797 | Line 797 | main(int argc, char *argv[])
797          mop[nmats].inspec = "trailing_ops";
798                                          /* load final concatenation matrix */
799          if (mcat_spec && !(mcat = rmx_load(mcat_spec, RMPnone))) {
800 <                fprintf(stderr, "%s: error loading concatenation matrix: %s",
800 >                fprintf(stderr, "%s: error loading concatenation matrix: %s\n",
801                                  argv[0], mcat_spec);
802                  return(1);
803          }
# Line 835 | Line 835 | main(int argc, char *argv[])
835                                          argv[0], mcat_spec);
836                          return(1);
837                  }
838 +                if (!split_input(&mop[nmats]))
839 +                        return(1);
840                  mop[nmats].rmp->ncols = mcat->ncols;
841          }
842          newheader("RADIANCE", stdout);  /* write output header */

Diff Legend

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