From 2940617e6f0abaf1d09b3f054687a0adac788505 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Sat, 26 Jul 2008 12:26:27 +0000
Subject: [PATCH] bugfix in some internal asserts of CacheFriendlyProduct

---
 Eigen/src/Core/CacheFriendlyProduct.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Eigen/src/Core/CacheFriendlyProduct.h b/Eigen/src/Core/CacheFriendlyProduct.h
index c3efbacaf..bad018e8e 100644
--- a/Eigen/src/Core/CacheFriendlyProduct.h
+++ b/Eigen/src/Core/CacheFriendlyProduct.h
@@ -421,7 +421,7 @@ EIGEN_DONT_INLINE static void ei_cache_friendly_product_colmajor_times_vector(
   // we cannot assume the first element is aligned because of sub-matrices
   const int lhsAlignmentOffset = ei_alignmentOffset(lhs,size);
   ei_internal_assert(size_t(lhs+lhsAlignmentOffset)%sizeof(Packet)==0);
-  
+
   // find how many columns do we have to skip to be aligned with the result (if possible)
   int skipColumns=0;
   for (; skipColumns<PacketSize && alignedStart != lhsAlignmentOffset + alignmentStep*skipColumns; ++skipColumns)
@@ -439,7 +439,7 @@ EIGEN_DONT_INLINE static void ei_cache_friendly_product_colmajor_times_vector(
   }
 
   ei_internal_assert((alignmentPattern==NoneAligned)
-    || size_t(lhs+alignedStart+alignmentStep*skipColumns)%sizeof(Packet)==0);
+    || (size_t(lhs+alignedStart+lhsStride*skipColumns)%sizeof(Packet))==0);
 
   int columnBound = ((rhs.size()-skipColumns)/columnsAtOnce)*columnsAtOnce + skipColumns;
   for (int i=skipColumns; i<columnBound; i+=columnsAtOnce)
@@ -602,8 +602,8 @@ EIGEN_DONT_INLINE static void ei_cache_friendly_product_rowmajor_times_vector(
     // note that the skiped columns are processed later.
   }
   ei_internal_assert((alignmentPattern==NoneAligned)
-    || size_t(lhs+alignedStart+alignmentStep*skipRows)%sizeof(Packet)==0);
-  
+    || (size_t(lhs+alignedStart+lhsStride*skipRows)%sizeof(Packet))==0);
+
   int rowBound = ((res.size()-skipRows)/rowsAtOnce)*rowsAtOnce + skipRows;
   for (int i=skipRows; i<rowBound; i+=rowsAtOnce)
   {