diff options
| author | siddhu8990 | 2016-01-13 11:16:07 +0530 |
|---|---|---|
| committer | siddhu8990 | 2016-01-13 11:16:07 +0530 |
| commit | ef666a6b9ac74d5effe8b34179cc3ad0c247e7c3 (patch) | |
| tree | 6cac6dba19d159bfca4f450b68aad627e9294091 /2.3-1/src/c/matrixOperations/includes/cat.h | |
| parent | 6294db4b43ec07171c2c3a868069b5023d8835a0 (diff) | |
| parent | 03a27e6884942182e984433fd2ebba7e5f55a4d9 (diff) | |
| download | Scilab2C-ef666a6b9ac74d5effe8b34179cc3ad0c247e7c3.tar.gz Scilab2C-ef666a6b9ac74d5effe8b34179cc3ad0c247e7c3.tar.bz2 Scilab2C-ef666a6b9ac74d5effe8b34179cc3ad0c247e7c3.zip | |
Merge branch 'master' of https://github.com/siddhu8990/Scilab2C
Diffstat (limited to '2.3-1/src/c/matrixOperations/includes/cat.h')
| -rw-r--r-- | 2.3-1/src/c/matrixOperations/includes/cat.h | 59 |
1 files changed, 58 insertions, 1 deletions
diff --git a/2.3-1/src/c/matrixOperations/includes/cat.h b/2.3-1/src/c/matrixOperations/includes/cat.h index 9f64a157..dde6b9bd 100644 --- a/2.3-1/src/c/matrixOperations/includes/cat.h +++ b/2.3-1/src/c/matrixOperations/includes/cat.h @@ -12,7 +12,7 @@ #ifndef __CAT_H__ #define __CAT_H__ - +#include "types.h" #include "dynlib_matrixoperations.h" #include "floatComplex.h" #include "doubleComplex.h" @@ -98,6 +98,63 @@ EXTERN_MATOPS void ccolumncata(floatComplex *in1, int lines1, int columns1, flo EXTERN_MATOPS void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, int lines2, int columns2, doubleComplex* out); EXTERN_MATOPS void zcolumncata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, int lines2, int columns2, doubleComplex* out); +/* +** \brief Concat uint8 arrays +** \param in1 the uint8 array to process +** \param lines1 +** \param columns1 +** \param in2 the uint8 array to process to concat +** \param lines2 +** \param columns2 +** \param out the concatenation +*/ + +EXTERN_MATOPS void u8rowcata(uint8 *in1, int lines1, int columns1, uint8 *in2, int lines2, int columns2, uint8* out); +EXTERN_MATOPS void u8columncata(uint8 *in1, int lines1, int columns1, uint8 *in2, int lines2, int columns2, uint8* out); + +/* +** \brief Concat uint16 arrays +** \param in1 the uint16 array to process +** \param lines1 +** \param columns1 +** \param in2 the uint16 array to process to concat +** \param lines2 +** \param columns2 +** \param out the concatenation +*/ + +EXTERN_MATOPS void u16rowcata(uint16 *in1, int lines1, int columns1, uint16 *in2, int lines2, int columns2, uint16* out); +EXTERN_MATOPS void u16columncata(uint16 *in1, int lines1, int columns1, uint16 *in2, int lines2, int columns2, uint16* out); + + +/* +** \brief Concat int8 arrays +** \param in1 the int8 array to process +** \param lines1 +** \param columns1 +** \param in2 the int8 array to process to concat +** \param lines2 +** \param columns2 +** \param out the concatenation +*/ + +EXTERN_MATOPS void i8rowcata(int8 *in1, int lines1, int columns1, int8 *in2, int lines2, int columns2, int8* out); +EXTERN_MATOPS void i8columncata(int8 *in1, int lines1, int columns1, int8 *in2, int lines2, int columns2, int8* out); + +/* +** \brief Concat int16 arrays +** \param in1 the int16 array to process +** \param lines1 +** \param columns1 +** \param in2 the int16 array to process to concat +** \param lines2 +** \param columns2 +** \param out the concatenation +*/ + +EXTERN_MATOPS void i16rowcata(int16 *in1, int lines1, int columns1, int16 *in2, int lines2, int columns2, int16* out); +EXTERN_MATOPS void i16columncata(int16 *in1, int lines1, int columns1, int16 *in2, int lines2, int columns2, int16* out); + #ifdef __cplusplus } /* extern "C" */ #endif |