OpenCV interface changed from c to c++

2 files changed, 29 insertions, 48 deletions

diff --git a/2.3-1/includes/blas.h b/2.3-1/includes/blas.h
index 86ab62f6..f4b0bdad 100644
--- a/2.3-1/includes/blas.h
+++ b/2.3-1/includes/blas.h
@@ -150,7 +150,7 @@ void	dgemm_(char *TRANSA, char* TRANSB, int *M, int *N, int *K,
 	       double *B, int *LDB, double *BETA,
 	       double *C, int *LDC);*/
 
-extern  int     C2F(dgemm)();
+extern  int     C2F(dgemm)(char *,char*,int*,int*,int*,double*,double*,int*,double*,int*,double*,double*,int*);
 extern  int     C2F(idamax)() ;/* could be transcribe easaly in c */
 extern  int     C2F(daxpy) () ;/* could be transcribe easaly in c */
 extern  int     C2F(dscal) () ;/* could be transcribe easaly in c */
diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h
index 3567ca78..0e8446ef 100644
--- a/2.3-1/includes/sci2clib.h
+++ b/2.3-1/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__ */
+
+