From 30ee44f8b45a5eb1cc5731a0d8fb1be0a19e7b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Thu, 18 Feb 2010 10:42:01 +0100
Subject: [PATCH] Estimation DLL, matrix library: fixed bug in
 mat::negate(),;mat::add(), mat::sub()

---
 mex/sources/estimation/libmat/Matrix.hh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mex/sources/estimation/libmat/Matrix.hh b/mex/sources/estimation/libmat/Matrix.hh
index e0d8a4e7e..657eb4035 100644
--- a/mex/sources/estimation/libmat/Matrix.hh
+++ b/mex/sources/estimation/libmat/Matrix.hh
@@ -293,10 +293,10 @@ namespace mat
     assert(m1.getRows() == m2.getRows() && m1.getCols() == m2.getCols());
     double *p1 = m1.getData();
     const double *p2 = m2.getData();
-    while (p1 < m1.getData() + m1.getRows() * m1.getLd())
+    while (p1 < m1.getData() + m1.getCols() * m1.getLd())
       {
-        double *pp1, *pp2;
-        while (pp1 < p1 + m1.getCols())
+        double *pp1 = p1, *pp2 = p2;
+        while (pp1 < p1 + m1.getRows())
           *pp1++ += *pp2++;
 
         p1 += m1.getLd();
@@ -312,10 +312,10 @@ namespace mat
     assert(m1.getRows() == m2.getRows() && m1.getCols() == m2.getCols());
     double *p1 = m1.getData();
     const double *p2 = m2.getData();
-    while (p1 < m1.getData() + m1.getRows() * m1.getLd())
+    while (p1 < m1.getData() + m1.getCols() * m1.getLd())
       {
-        double *pp1, *pp2;
-        while (pp1 < p1 + m1.getCols())
+        double *pp1 = p1, *pp2 = p2;
+        while (pp1 < p1 + m1.getRows())
           *pp1++ -= *pp2++;
 
         p1 += m1.getLd();
@@ -329,10 +329,10 @@ namespace mat
   negate(Mat m)
   {
     double *p = m.getData();
-    while (p < m.getData() + m.getRows() * m.getLd())
+    while (p < m.getData() + m.getCols() * m.getLd())
       {
-        double *pp;
-        while (pp < p + m.getCols())
+        double *pp = p;
+        while (pp < p + m.getRows())
           {
             *pp = -*pp;
             pp++;