[ViewVC] Diff of: Development/ray/src/util/rmatrix.c

Comparing ray/src/util/rmatrix.c (file contents):
Revision 2.72 by greg, Tue Dec 5 21:45:39 2023 UTC vs.
Revision 2.73 by greg, Wed Dec 6 17:57:34 2023 UTC

+        return(dnew);
-+
+/* Replace data in first matrix with data from second */
-+
+int
-+
+rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int dometa)
-+
+{
-+
+        if (!rdst | !rsrc || (rdst->nrows != rsrc->nrows) |
-+
+                        (rdst->ncols != rsrc->ncols) |
-+
+                        (rdst->ncomp != rsrc->ncomp))
-+
+                return(0);
-+
-+
+        if (dometa) {           /* transfer everything? */
-+
+                rmx_reset(rdst);
-+
+                *rdst = *rsrc;
-+
+                rsrc->info = NULL; rsrc->mapped = NULL; rsrc->mtx = NULL;
-+
+                return(1);
-+
+        }
-+
+        if (rdst->mapped)
-+
+                return(0);      /* XXX can't handle this case */
-+
+                                /* just matrix data -- leave metadata */
-+
+        if (rdst->mtx) free(rdst->mtx);
-+
+        rdst->mtx = rsrc->mtx;
-+
+        rsrc->mtx = NULL;
-+
+        return(1);
-+
+}
-+
+/* Allocate and assign transposed matrix */
+RMATRIX *
+rmx_transpose(const RMATRIX *rm)

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