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

Comparing ray/src/util/rmatrix.c (file contents):
Revision 2.72 by greg, Tue Dec 5 21:45:39 2023 UTC vs.
Revision 2.78 by greg, Thu Feb 29 03:11:13 2024 UTC

# Line 393 | Line 393 | rmx_load(const char *inspec, RMPref rmp)
393                  }                               /* else open it ourselves */
394                  fp = fopen(inspec, "r");
395          }
396 <        if (!fp)
396 >        if (!fp) {
397 >                fprintf(stderr, "Cannot open for reading: %s\n", inspec);
398                  return(NULL);
399 +        }
400   #ifdef getc_unlocked
401          flockfile(fp);
402   #endif
# Line 499 | Line 501 | rmx_write_spec(const double *dp, int nc, int len, FILE
501          if (nc < 3) return(0);
502          scan = (uby8 *)tempbuffer((nc+1)*len);
503          if (!scan) return(0);
504 <        for (j = len; j--; dp += nc) {
504 >        for (j = 0; j < len; j++, dp += nc) {
505                  for (k = nc; k--; )
506                          scol[k] = dp[k];
507                  scolor2scolr(scan+j*(nc+1), scol, nc);
# Line 539 | Line 541 | rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
541                  dtype = DTxyze;
542          else if ((dtype == DTxyze) & (rm->dtype == DTrgbe))
543                  dtype = DTrgbe;
544 <        if ((dtype == DTspec) & (rm->ncomp < 3))
544 >        if ((dtype < DTspec) & (rm->ncomp > 3))
545 >                dtype = DTspec;
546 >        else if ((dtype == DTspec) & (rm->ncomp <= 3))
547                  return(0);
548  
549          if (dtype == DTascii)                   /* set file type (WINDOWS) */
# Line 560 | Line 564 | rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
564          }
565          if (dtype >= DTspec) {                  /* # components & split? */
566                  fputncomp(rm->ncomp, fp);
567 <                if (dtype == DTspec || (rm->ncomp > 3 &&
568 <                                memcmp(rm->wlpart, WLPART, sizeof(WLPART))))
567 >                if (rm->ncomp > 3 &&
568 >                                memcmp(rm->wlpart, WLPART, sizeof(WLPART)))
569                          fputwlsplit(rm->wlpart, fp);
570          } else if ((rm->ncomp != 3) & (rm->ncomp != 1))
571                  return(0);                      /* wrong # components */
# Line 666 | Line 670 | rmx_copy(const RMATRIX *rm)
670          copycolor(dnew->cexp, rm->cexp);
671          memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart));
672          return(dnew);
673 + }
674 +
675 + /* Replace data in first matrix with data from second */
676 + int
677 + rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int dometa)
678 + {
679 +        if (!rdst | !rsrc || (rdst->nrows != rsrc->nrows) |
680 +                        (rdst->ncols != rsrc->ncols) |
681 +                        (rdst->ncomp != rsrc->ncomp))
682 +                return(0);
683 +
684 +        if (dometa) {           /* transfer everything? */
685 +                rmx_reset(rdst);
686 +                *rdst = *rsrc;
687 +                rsrc->info = NULL; rsrc->mapped = NULL; rsrc->mtx = NULL;
688 +                return(1);
689 +        }
690 + #ifdef MAP_FILE                 /* just matrix data -- leave metadata */
691 +        if (rdst->mapped)
692 +                munmap(rdst->mapped, mapped_size(rdst));
693 +        else
694 + #endif
695 +        if (rdst->mtx)
696 +                free(rdst->mtx);
697 +        rdst->mapped = rsrc->mapped;
698 +        rdst->mtx = rsrc->mtx;
699 +        rsrc->mapped = NULL; rsrc->mtx = NULL;
700 +        return(1);
701   }
702  
703   /* Allocate and assign transposed matrix */

Diff Legend

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