diff options
| author | yash1112 | 2017-07-07 22:03:16 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:03:16 +0530 |
| commit | 640f9fcf3f64298c7958f4bde5a7e6a7602a690d (patch) | |
| tree | f2d5c577e9c719190f2ce68c976a9acefd6611c6 /2.3-1/src/c/matrixOperations/cat | |
| parent | e9de337a34e123749927039f7011fb30fc96f7c9 (diff) | |
| parent | 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 (diff) | |
| download | Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.gz Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.tar.bz2 Scilab2C-640f9fcf3f64298c7958f4bde5a7e6a7602a690d.zip | |
Scilab2C Arduino Updated
Diffstat (limited to '2.3-1/src/c/matrixOperations/cat')
| -rw-r--r-- | 2.3-1/src/c/matrixOperations/cat/ccata.c | 4 | ||||
| -rw-r--r-- | 2.3-1/src/c/matrixOperations/cat/zcata.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/2.3-1/src/c/matrixOperations/cat/ccata.c b/2.3-1/src/c/matrixOperations/cat/ccata.c index cd2b4c92..6a2a6d99 100644 --- a/2.3-1/src/c/matrixOperations/cat/ccata.c +++ b/2.3-1/src/c/matrixOperations/cat/ccata.c @@ -26,7 +26,11 @@ void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, i { for (j = 0 ; j < lines1 ; ++j) { +<<<<<<< HEAD out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; +======= + /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } for (j = 0 ; j < lines2 ; ++j) { diff --git a/2.3-1/src/c/matrixOperations/cat/zcata.c b/2.3-1/src/c/matrixOperations/cat/zcata.c index 485553d7..659f14c0 100644 --- a/2.3-1/src/c/matrixOperations/cat/zcata.c +++ b/2.3-1/src/c/matrixOperations/cat/zcata.c @@ -26,7 +26,11 @@ void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, { for (j = 0 ; j < lines1 ; ++j) { +<<<<<<< HEAD out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; +======= + /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } for (j = 0 ; j < lines2 ; ++j) { |