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

Comparing src/util/rmatrix.c (file contents):
Revision 2.37 by greg, Wed Sep 4 00:03:05 2019 UTC vs.
Revision 2.40 by greg, Wed Mar 25 01:51:09 2020 UTC

# Line 5 | Line 5 | static const char RCSid[] = "$Id$";
5   * General matrix operations.
6   */
7  
8 – #include <stdio.h>
8   #include <stdlib.h>
10 – #include <string.h>
11 – #include <fcntl.h>
9   #include <errno.h>
10   #include "rtio.h"
11   #include "platform.h"
# Line 103 | Line 100 | get_dminfo(char *s, void *p)
100                  ip->swapin = (nativebigendian() != i);
101                  return(0);
102          }
103 +        if (isexpos(s)) {
104 +                double  d = exposval(s);
105 +                scalecolor(ip->mtx, d);
106 +                return(0);
107 +        }
108 +        if (iscolcor(s)) {
109 +                COLOR   ctmp;
110 +                colcorval(ctmp, s);
111 +                multcolor(ip->mtx, ctmp);
112 +                return(0);
113 +        }
114          if (!formatval(fmt, s)) {
115                  rmx_addinfo(ip, s);
116                  return(0);
# Line 229 | Line 237 | rmx_load(const char *inspec)
237          dinfo.dtype = DTascii;                  /* assumed w/o FORMAT */
238          dinfo.swapin = 0;
239          dinfo.info = NULL;
240 +        dinfo.mtx[0] = dinfo.mtx[1] = dinfo.mtx[2] = 1.;
241          if (getheader(fp, get_dminfo, &dinfo) < 0) {
242                  fclose(fp);
243                  return(NULL);
# Line 275 | Line 284 | rmx_load(const char *inspec)
284          case DTxyze:
285                  if (!rmx_load_rgbe(dnew, fp))
286                          goto loaderr;
287 <                dnew->dtype = dinfo.dtype;
287 >                dnew->dtype = dinfo.dtype;      /* undo exposure? */
288 >                if ((dinfo.mtx[0] != 1.) | (dinfo.mtx[1] != 1.) |
289 >                                (dinfo.mtx[2] != 1.)) {
290 >                        dinfo.mtx[0] = 1./dinfo.mtx[0];
291 >                        dinfo.mtx[1] = 1./dinfo.mtx[1];
292 >                        dinfo.mtx[2] = 1./dinfo.mtx[2];
293 >                        rmx_scale(dnew, dinfo.mtx);
294 >                }
295                  break;
296          default:
297                  goto loaderr;
# Line 655 | Line 671 | rmx_transform(const RMATRIX *msrc, int n, const double
671                  return(NULL);
672          if (msrc->info) {
673                  char    buf[128];
674 <                sprintf(buf, "Applied %dx%d matrix transform\n",
674 >                sprintf(buf, "Applied %dx%d component transform\n",
675                                  dnew->ncomp, msrc->ncomp);
676                  rmx_addinfo(dnew, msrc->info);
677                  rmx_addinfo(dnew, buf);

Diff Legend

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