OpenCV interface changed from c to c++

3 files changed, 14 insertions, 34 deletions

diff --git a/src/c/imageProcessing/interfaces/int_cvcore.h b/src/c/imageProcessing/interfaces/int_cvcore.hpp
index 5ae0055..82c1313 100644
--- a/src/c/imageProcessing/interfaces/int_cvcore.h
+++ b/src/c/imageProcessing/interfaces/int_cvcore.hpp
@@ -13,20 +13,14 @@
 #ifndef __INT_CVCORE_H__
 #define __INT_CVCORE_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 
 #include "types.h"
-#include "cvcore.h"
+#include "cvcore.hpp"
 
-#define d0d0g2d0CV_CreateImageim0(width,height,depth,depth_size,no_of_ch) \
+#define d0d0g2d0CV_CreateImagemt0(width,height,depth,depth_size,no_of_ch) \
 				imcvCreateImages(width,height,depth,no_of_ch)
 
-#define im0CV_GetImgSized2(img,imgsize) imcvGetImgSizes(img,imgsize)
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
+#define mt0CV_GetImgSized2(img,imgsize) imcvGetImgSizes(img,imgsize)
+
 
 #endif  /*__INT_CVCORE_H__*/
diff --git a/src/c/imageProcessing/interfaces/int_cvhighgui.h b/src/c/imageProcessing/interfaces/int_cvhighgui.hpp
index d8ecf1c..05f260f 100644
--- a/src/c/imageProcessing/interfaces/int_cvhighgui.h
+++ b/src/c/imageProcessing/interfaces/int_cvhighgui.hpp
@@ -13,22 +13,16 @@
 #ifndef __INT_CVHIGHGUI_H__
 #define __INT_CVHIGHGUI_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 
 #include "types.h"
+#include "opencv2/core/core.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
-#define g2d0CV_LoadImageim0(filename,name_size,loadtype) imcvLoadImages(filename,loadtype)
-#define g2im0CV_ShowImageu80(winname,win_size,img) imcvShowImages(winname,img)
-#define im0CV_ShowImageu80(img) imcvShowImages("",img) 
+//#define g2d0CV_LoadImageim0(filename,name_size,loadtype) imcvLoadImages(filename,loadtype)
+#define g2d0CV_LoadImagemt0(filename,name_size,loadtype) imread(filename,loadtype)
+#define g2mt0CV_ShowImageu80(winname,win_size,img) imshow(winname,img)
+#define mt0CV_ShowImageu80(img) imshow("",img) 
 #define d0CV_WaitKeyu80(delay) cvWaitKey(delay)
-#define g2im0CV_SaveImageu80(filename,name_size,img) cvSaveImage(filename,img,NULL)	
-
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
+#define g2mt0CV_SaveImageu80(filename,name_size,img) imwrite(filename,img)	
 
 #endif  /*__INT_CVHIGHGUI_H__*/
diff --git a/src/c/imageProcessing/interfaces/int_cvimgproc.h b/src/c/imageProcessing/interfaces/int_cvimgproc.hpp
index 47192e1..65fa77e 100644
--- a/src/c/imageProcessing/interfaces/int_cvimgproc.h
+++ b/src/c/imageProcessing/interfaces/int_cvimgproc.hpp
@@ -13,20 +13,12 @@
 #ifndef __INT_CVIMGPROC_H__
 #define __INT_CVIMGPROC_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
 #include "types.h"
+#include "opencv2/core/core.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 
-#define im0im0g2CV_CvtColoru80(src,dst,code,code_size) imcvCvtColors(src,dst,code)
-#define im0d0d0g2CV_Thresholdim0(src,threshold,maxvalue,thresh_type,type_size) 
-				imcvThrehold(src,threshold,maxvalue,thresh_type)
-
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
+#define mt0g2CV_CvtColormt0(src,code,code_size) imcvCvtColors(src,code)
+#define mt0d0d0g2CV_Thresholdmt0(src,threshold,maxvalue,thresh_type,type_size) \
+				imcvThresholds(src,threshold,maxvalue,thresh_type)
 
 #endif  /*__INT_CVIMGPROC_H__*/