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

Comparing ray/src/util/rmatrix.c (file contents):
Revision 2.100 by greg, Thu Jun 19 22:03:37 2025 UTC vs.
Revision 2.101 by greg, Mon Aug 11 22:31:33 2025 UTC

# Line 20 | Line 20 | static const char      rmx_mismatch_warn[] = "WARNING: data
20  
21   /* Initialize a RMATRIX struct but don't allocate array space */
22   RMATRIX *
23 < rmx_new(int nr, int nc, int n)
23 > rmx_new(int nr, int nc, int ncomp)
24   {
25          RMATRIX *dnew;
26  
27 <        if (n <= 0)
27 >        if (ncomp <= 0)
28                  return(NULL);
29  
30          dnew = (RMATRIX *)calloc(1, sizeof(RMATRIX));
# Line 34 | Line 34 | rmx_new(int nr, int nc, int n)
34          dnew->dtype = DTrmx_native;
35          dnew->nrows = nr;
36          dnew->ncols = nc;
37 <        dnew->ncomp = n;
37 >        dnew->ncomp = ncomp;
38          setcolor(dnew->cexp, 1.f, 1.f, 1.f);
39          memcpy(dnew->wlpart, WLPART, sizeof(dnew->wlpart));
40  
# Line 57 | Line 57 | rmx_prepare(RMATRIX *rm)
57  
58   /* Call rmx_new() and rmx_prepare() */
59   RMATRIX *
60 < rmx_alloc(int nr, int nc, int n)
60 > rmx_alloc(int nr, int nc, int ncomp)
61   {
62 <        RMATRIX *dnew = rmx_new(nr, nc, n);
62 >        RMATRIX *dnew = rmx_new(nr, nc, ncomp);
63  
64          if (!rmx_prepare(dnew)) {
65                  rmx_free(dnew);
# Line 488 | Line 488 | rmx_write_double(const rmx_dtype *dp, int len, FILE *f
488   #endif
489  
490   static int
491 < rmx_write_ascii(const rmx_dtype *dp, int nc, int len, FILE *fp)
491 > rmx_write_ascii(const rmx_dtype *dp, int ncomp, int len, FILE *fp)
492   {
493          while (len-- > 0) {
494 <                int     k = nc;
494 >                int     k = ncomp;
495                  while (k-- > 0)
496                          fprintf(fp, " %.7e", *dp++);
497                  fputc('\t', fp);
# Line 500 | Line 500 | rmx_write_ascii(const rmx_dtype *dp, int nc, int len,
500   }
501  
502   static int
503 < rmx_write_rgbe(const rmx_dtype *dp, int nc, int len, FILE *fp)
503 > rmx_write_rgbe(const rmx_dtype *dp, int ncomp, int len, FILE *fp)
504   {
505          COLR    *scan;
506          int     j;
507  
508 <        if ((nc != 1) & (nc != 3)) return(0);
508 >        if ((ncomp != 1) & (ncomp != 3)) return(0);
509          scan = (COLR *)tempbuffer(sizeof(COLR)*len);
510          if (!scan) return(0);
511  
512 <        for (j = 0; j < len; j++, dp += nc)
513 <                if (nc == 1)
512 >        for (j = 0; j < len; j++, dp += ncomp)
513 >                if (ncomp == 1)
514                          setcolr(scan[j], dp[0], dp[0], dp[0]);
515                  else
516                          setcolr(scan[j], dp[0], dp[1], dp[2]);
# Line 519 | Line 519 | rmx_write_rgbe(const rmx_dtype *dp, int nc, int len, F
519   }
520  
521   static int
522 < rmx_write_spec(const rmx_dtype *dp, int nc, int len, FILE *fp)
522 > rmx_write_spec(const rmx_dtype *dp, int ncomp, int len, FILE *fp)
523   {
524          COLRV   *scan;
525          COLORV  scol[MAXCOMP];
526          int     j, k;
527  
528 <        if ((nc < 3) | (nc > MAXCOMP)) return(0);
529 <        scan = (COLRV *)tempbuffer((nc+1)*len);
528 >        if ((ncomp < 3) | (ncomp > MAXCOMP)) return(0);
529 >        scan = (COLRV *)tempbuffer((ncomp+1)*len);
530          if (!scan) return(0);
531 <        for (j = 0; j < len; j++, dp += nc) {
532 <                for (k = nc; k--; )
531 >        for (j = 0; j < len; j++, dp += ncomp) {
532 >                for (k = ncomp; k--; )
533                          scol[k] = dp[k];
534 <                scolor2scolr(scan+j*(nc+1), scol, nc);
534 >                scolor2scolr(scan+j*(ncomp+1), scol, ncomp);
535          }
536 <        return(fwritescolrs(scan, nc, len, fp) >= 0);
536 >        return(fwritescolrs(scan, ncomp, len, fp) >= 0);
537   }
538  
539   /* Check if CIE XYZ primaries were specified */
# Line 611 | Line 611 | rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
611  
612   /* Write out matrix data (usually by row) */
613   int
614 < rmx_write_data(const rmx_dtype *dp, int nc, int len, int dtype, FILE *fp)
614 > rmx_write_data(const rmx_dtype *dp, int ncomp, int len, int dtype, FILE *fp)
615   {
616          switch (dtype) {
617   #if DTrmx_native==DTdouble
618          case DTfloat:
619 <                return(rmx_write_float(dp, nc*len, fp));
619 >                return(rmx_write_float(dp, ncomp*len, fp));
620   #else
621          case DTdouble:
622 <                return(rmx_write_double(dp, nc*len, fp));
622 >                return(rmx_write_double(dp, ncomp*len, fp));
623   #endif
624          case DTrmx_native:
625 <                return(putbinary(dp, sizeof(*dp)*nc, len, fp) == len);
625 >                return(putbinary(dp, sizeof(*dp)*ncomp, len, fp) == len);
626          case DTascii:
627 <                return(rmx_write_ascii(dp, nc, len, fp));
627 >                return(rmx_write_ascii(dp, ncomp, len, fp));
628          case DTrgbe:
629          case DTxyze:
630 <                return(rmx_write_rgbe(dp, nc, len, fp));
630 >                return(rmx_write_rgbe(dp, ncomp, len, fp));
631          case DTspec:
632 <                return(rmx_write_spec(dp, nc, len, fp));
632 >                return(rmx_write_spec(dp, ncomp, len, fp));
633          }
634          return(0);
635   }

Diff Legend

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