summaryrefslogtreecommitdiff
path: root/includes/sci2clib.h
diff options
context:
space:
mode:
authorsiddhu89902016-08-29 10:47:52 +0530
committersiddhu89902016-08-29 10:47:52 +0530
commit2790257d385a9d7d9e0dab9205baf4b3df0dd8c8 (patch)
tree6a4ab6f09c9308bb1bf39e087b5d3b24d242519a /includes/sci2clib.h
parentea1e22e36a9559448919d7ae2dd24a25743861ec (diff)
downloadScilab2C_fossee_old-2790257d385a9d7d9e0dab9205baf4b3df0dd8c8.tar.gz
Scilab2C_fossee_old-2790257d385a9d7d9e0dab9205baf4b3df0dd8c8.tar.bz2
Scilab2C_fossee_old-2790257d385a9d7d9e0dab9205baf4b3df0dd8c8.zip
OpenCV interface changed from c to c++
Diffstat (limited to 'includes/sci2clib.h')
-rw-r--r--includes/sci2clib.h75
1 files changed, 28 insertions, 47 deletions
diff --git a/includes/sci2clib.h b/includes/sci2clib.h
index 3567ca7..0e8446e 100644
--- a/includes/sci2clib.h
+++ b/includes/sci2clib.h
@@ -1,55 +1,22 @@
#ifndef __SCI2CLIB_H__
#define __SCI2CLIB_H__
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <stdlib.h>
#include <string.h>
#include <math.h>
-/* #include "SCI2CMacroInterface.h"
- */
-/* #include "notFound.h"
- */
-/* #include "doubleComplex.h"
- */
-/* #include "floatComplex.h"
- */
-/* #include "RealToComplex.h"
- */
-/* #include "OpEqual.h"
- */
-/* #include "OpIns.h"
- */
-/* #include "OpExt.h"
- */
-/* #include "FileManagement.h"
- */
-/* #include "OpLogNe.h"
- */
-/* #include "OpLogGt.h"
- */
-/* #include "OpLogLt.h"
- */
-/* #include "OpLogGe.h"
- */
-/* #include "OpLogLe.h"
- */
-/* #include "OpLogEq.h"
- */
-/* #include "OpLogOr.h"
- */
-/* #include "OpLogAnd.h"
- */
-/* #include "OpLogNot.h"
- */
-/* #include "ConvertPrecision.h" */
-
+
/* CONSTANT */
#include "constant.h"
/* LIB */
-/* interfacing lapack */
-#include "lapack.h"
/* interfacing blas */
#include "blas.h"
+/* interfacing lapack */
+#include "lapack.h"
/* AUXILIARY FUNCTIONS */
@@ -407,13 +374,13 @@
#include "int_convstr.h"
/*Functions related to opencv*/
-#include "cvcore.h"
-#include "int_cvcore.h"
-#include "cvhighgui.h"
-#include "int_cvhighgui.h"
-#include "cvimgproc.h"
-#include "int_cvimgproc.h"
-
+/*#include "cvcore.hpp"
+#include "int_cvcore.hpp"
+#include "cvhighgui.hpp"
+#include "int_cvhighgui.hpp"
+#include "cvimgproc.hpp"
+#include "int_cvimgproc.hpp"
+*/
/*Scilab-arduino toolbox*/
#ifdef Arduino1
#include "int_cmd_digital_out.h"
@@ -464,4 +431,18 @@
#include "int_RPIPeripheralPWM.h"
#include "RPIPeripheralPWM.h"
#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#include "cvcore.hpp"
+#include "int_cvcore.hpp"
+#include "cvhighgui.hpp"
+#include "int_cvhighgui.hpp"
+#include "cvimgproc.hpp"
+#include "int_cvimgproc.hpp"
+
#endif /* !__SCI2CLIB_H__ */
+
+