summaryrefslogtreecommitdiff
path: root/src/matrixOperations/cat/scata.c
diff options
context:
space:
mode:
authortorset2009-01-22 14:59:05 +0000
committertorset2009-01-22 14:59:05 +0000
commit094239ed4e5e7ec3e69b32d850eca784fa8eb8d2 (patch)
treec32509f57efc0bb29e9c945c294dc13c6cbf36f6 /src/matrixOperations/cat/scata.c
parent2896ff8643e32923ea30ad4bd683231cb2ba4b6a (diff)
downloadscilab2c-094239ed4e5e7ec3e69b32d850eca784fa8eb8d2.tar.gz
scilab2c-094239ed4e5e7ec3e69b32d850eca784fa8eb8d2.tar.bz2
scilab2c-094239ed4e5e7ec3e69b32d850eca784fa8eb8d2.zip
update
Diffstat (limited to 'src/matrixOperations/cat/scata.c')
-rw-r--r--src/matrixOperations/cat/scata.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/matrixOperations/cat/scata.c b/src/matrixOperations/cat/scata.c
index 252a054d..da0853c6 100644
--- a/src/matrixOperations/cat/scata.c
+++ b/src/matrixOperations/cat/scata.c
@@ -11,11 +11,12 @@
*/
#include "cat.h"
+#include "stdio.h"
/*
** Emulate Scilab (from help cat) :
** then the concatenation is done according to the rows
**
-** A1=[1 2 3 ; 4 5 6]; A2=[7 8 9 ; 10 11 12]; y=cat(1,A1,A2) => y=[1 2 3 ; 4 5 61 ;7 8 9; 10 11 12]
+** A1=[1 2 3 ; 4 5 6]; A2=[7 8 9 ; 10 11 12]; y=cat(1,A1,A2) => y=[1 2 3 ; 4 5 6 ;7 8 9; 10 11 12]
**
*/
@@ -28,7 +29,7 @@ void srowcata(float *in1, int lines1, int columns1, float *in2, int lines2, int
{
out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];
}
- for (j = 0 ; j < lines1 ; ++j)
+ for (j = 0 ; j < lines2 ; ++j)
{
out[i*(lines1 + lines2) + lines1 + j] = in2[i*lines2 + j];
}