Added Matthews changes from branch 1.21.2.1

SpMat.h

@@ -384,7 +384,7 @@ SpMat<T>::SpMat(const NEWMAT::GeneralMatrix& M)
     // First find # of non-zeros elements in column
     unsigned int cnz = 0;
     for (unsigned int i=0; i<_m; i++) {
-      if (m[i*_n+c]) cnz++;
+      if (m[i+_m*c]) cnz++;
     }
     if (cnz) {
       std::vector<unsigned int>&   ri = _ri[c];
@@ -392,7 +392,7 @@ SpMat<T>::SpMat(const NEWMAT::GeneralMatrix& M)
       ri.resize(cnz);
       val.resize(cnz);
       for (unsigned int rii=0, i=0; i<_m; i++) {
-        if (double v = m[i*_n+c]) {
+        if (double v = m[i+_m*c]) {
           ri[rii] = i;
           val[rii] = v;
           rii++;