--- ray/src/util/rmatrix.c 2014/12/16 20:21:46 2.11 +++ ray/src/util/rmatrix.c 2015/01/23 01:14:20 2.12 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rmatrix.c,v 2.11 2014/12/16 20:21:46 greg Exp $"; +static const char RCSid[] = "$Id: rmatrix.c,v 2.12 2015/01/23 01:14:20 greg Exp $"; #endif /* * General matrix operations. @@ -418,16 +418,14 @@ RMATRIX * rmx_identity(const int dim, const int n) { RMATRIX *rid = rmx_alloc(dim, dim, n); - int i; + int i, k; if (rid == NULL) return(NULL); - memset(rid->mtx, 0, sizeof(rid->mtx[0])*dim*dim); + memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); for (i = dim; i--; ) - rmx_lval(rid,i,i,0) = 1; - for (i = n; --i; ) - memcpy(rid->mtx+i*(dim*dim), rid->mtx, - sizeof(rid->mtx[0])*dim*dim); + for (k = n; k--; ) + rmx_lval(rid,i,i,k) = 1; return(rid); }