Fix Ref<SparseMatrix> for Transpose<SparseVector>

3 files changed, 13 insertions, 16 deletions

diff --git a/Eigen/src/SparseCore/SparseMap.h b/Eigen/src/SparseCore/SparseMap.h
index 058a6d62b..349927905 100644
--- a/Eigen/src/SparseCore/SparseMap.h
+++ b/Eigen/src/SparseCore/SparseMap.h
@@ -114,7 +114,7 @@ class SparseMapBase<Derived,ReadOnlyAccessors>
 
     // for vectors
     inline SparseMapBase(Index size, Index nnz, IndexPointer innerIndexPtr, ScalarPointer valuePtr)
-      : m_outerSize(1), m_innerSize(size), m_zero_nnz(0,nnz), m_outerIndex(m_zero_nnz.data()),
+      : m_outerSize(1), m_innerSize(size), m_zero_nnz(0,internal::convert_index<StorageIndex>(nnz)), m_outerIndex(m_zero_nnz.data()),
         m_innerIndices(innerIndexPtr), m_values(valuePtr), m_innerNonZeros(0)
     {}
 
@@ -173,6 +173,11 @@ class SparseMapBase<Derived,WriteAccessors>
       : Base(rows, cols, nnz, outerIndexPtr, innerIndexPtr, valuePtr, innerNonZerosPtr)
     {}
 
+    // for vectors
+    inline SparseMapBase(Index size, Index nnz, StorageIndex* innerIndexPtr, Scalar* valuePtr)
+      : Base(size, nnz, innerIndexPtr, valuePtr)
+    {}
+
     /** Empty destructor */
     inline ~SparseMapBase() {}
 
diff --git a/Eigen/src/SparseCore/SparseRef.h b/Eigen/src/SparseCore/SparseRef.h
index fbd489a13..262fd9aef 100644
--- a/Eigen/src/SparseCore/SparseRef.h
+++ b/Eigen/src/SparseCore/SparseRef.h
@@ -66,23 +66,13 @@ public:
   
 protected:
 
-
   template<typename Expression>
   void construct(Expression& expr)
   {
-    ::new (static_cast<Base*>(this)) Base(expr.rows(), expr.cols(), expr.nonZeros(), expr.outerIndexPtr(), expr.innerIndexPtr(), expr.valuePtr(), expr.innerNonZeroPtr());
-  }
-
-  template<int ExprOptions>
-  void construct(const SparseVector<Scalar,ExprOptions,StorageIndex>& expr)
-  {
-    ::new (static_cast<Base*>(this)) Base(expr.size(), expr.nonZeros(), expr.innerIndexPtr(), expr.valuePtr());
-  }
-
-  template<int ExprOptions>
-  void construct(SparseVector<Scalar,ExprOptions,StorageIndex>& expr)
-  {
-    ::new (static_cast<Base*>(this)) Base(expr.size(), expr.nonZeros(), expr.innerIndexPtr(), expr.valuePtr());
+    if(expr.outerIndexPtr()==0)
+      ::new (static_cast<Base*>(this)) Base(expr.size(), expr.nonZeros(), expr.innerIndexPtr(), expr.valuePtr());
+    else
+      ::new (static_cast<Base*>(this)) Base(expr.rows(), expr.cols(), expr.nonZeros(), expr.outerIndexPtr(), expr.innerIndexPtr(), expr.valuePtr(), expr.innerNonZeroPtr());
   }
 };
 
diff --git a/Eigen/src/SparseCore/SparseTranspose.h b/Eigen/src/SparseCore/SparseTranspose.h
index c2d4ac549..b6f180a41 100644
--- a/Eigen/src/SparseCore/SparseTranspose.h
+++ b/Eigen/src/SparseCore/SparseTranspose.h
@@ -27,12 +27,14 @@ namespace internal {
     using Base::derived;
     typedef typename Base::Scalar Scalar;
     typedef typename Base::StorageIndex StorageIndex;
+
+    inline Index nonZeros() const { return derived().nestedExpression().nonZeros(); }
     
     inline const Scalar* valuePtr() const { return derived().nestedExpression().valuePtr(); }
     inline const StorageIndex* innerIndexPtr() const { return derived().nestedExpression().innerIndexPtr(); }
     inline const StorageIndex* outerIndexPtr() const { return derived().nestedExpression().outerIndexPtr(); }
     inline const StorageIndex* innerNonZeroPtr() const { return derived().nestedExpression().innerNonZeroPtr(); }
-    
+
     inline Scalar* valuePtr() { return derived().nestedExpression().valuePtr(); }
     inline StorageIndex* innerIndexPtr() { return derived().nestedExpression().innerIndexPtr(); }
     inline StorageIndex* outerIndexPtr() { return derived().nestedExpression().outerIndexPtr(); }