From 52780e449df15747b1339b1fa2c8caf8d69b2c56 Mon Sep 17 00:00:00 2001 From: imushir Date: Mon, 28 Dec 2015 17:01:05 +0530 Subject: added support for uint8 uin16 int8 int16 --- src/c/matrixOperations/cat/u16cata.c | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/c/matrixOperations/cat/u16cata.c (limited to 'src/c/matrixOperations/cat/u16cata.c') diff --git a/src/c/matrixOperations/cat/u16cata.c b/src/c/matrixOperations/cat/u16cata.c new file mode 100644 index 00000000..2b756e59 --- /dev/null +++ b/src/c/matrixOperations/cat/u16cata.c @@ -0,0 +1,53 @@ +/* Scilab2C FOSSEE IIT BOMBAY*/ +#include "cat.h" +/* From scilab 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); +output => y = [1 2 3; 4 5 6;7 8 9;10 11 12] +*/ + +void u16rowcata(uint16 *in1,int lines1,int columns1,uint16 *in2,int lines2,int columns2,uint16* out) +{ + int i = 0; + int j = 0; + for(i = 0;i < columns1 && i < columns2; ++i) + { + for(j = 0;j < lines1; ++j) + { + out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; + } + for(j = 0;j < lines2; ++j) + { + out[i*(lines1 + lines2) + lines1 + j] = in2[i*lines2 + j]; + } + + } +} + + /* From scilab 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(2,A1,A2); +output => y = [1 2 3 7 8 9; 4 5 6 10 11 12] +*/ + +void u16columncata(uint16 *in1,int lines1,int columns1,uint16 *in2,int lines2,int columns2,uint16* out) + { + int i = 0; + for(i = 0; i < lines1 * columns1;++i) + { + out[i] = in1[i]; + + } + for(i = 0;i < lines2 * columns2;++i) + { + + out[i + lines1 * columns2] = in2[i]; + + } + + } + + + -- cgit From 453598b49cb3d4a62b1797dbc90f0e3dd4521329 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Wed, 19 Apr 2017 11:56:09 +0530 Subject: Copyright message updated in added files and libraries separated in 'thirdparty' folder --- src/c/matrixOperations/cat/u16cata.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/c/matrixOperations/cat/u16cata.c') diff --git a/src/c/matrixOperations/cat/u16cata.c b/src/c/matrixOperations/cat/u16cata.c index 2b756e59..8c33acb9 100644 --- a/src/c/matrixOperations/cat/u16cata.c +++ b/src/c/matrixOperations/cat/u16cata.c @@ -1,4 +1,14 @@ -/* Scilab2C FOSSEE IIT BOMBAY*/ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Mushir + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ #include "cat.h" /* From scilab help cat then the concatenation is done according to the rows A1 = [1 2 3;4 5 6]; -- cgit