OpenCV interface changed from c to c++

61 files changed, 116 insertions, 166 deletions

diff --git a/src/c/auxiliaryFunctions/interfaces/int_conj.h b/src/c/auxiliaryFunctions/interfaces/int_conj.h
index fec555b..7884c99 100644
--- a/src/c/auxiliaryFunctions/interfaces/int_conj.h
+++ b/src/c/auxiliaryFunctions/interfaces/int_conj.h
@@ -15,7 +15,7 @@
 #ifndef __INT_CONJ_H__
 #define __INT_CONJ_H__
 
-#define copy(in,size,out)		{int i;for (i=0; i<size[0]*size[1];i++) out[i]=in[i];}
+#define copy_c(in,size,out)		{int i;for (i=0; i<size[0]*size[1];i++) out[i]=in[i];}
 
 #define s0conjs0(in)			in
 
@@ -33,20 +33,20 @@
 
 #define i160conji160(in)		in
 
-#define s2conjs2(in,size,out)		copy(in,size,out)
+#define s2conjs2(in,size,out)		copy_c(in,size,out)
 
-#define d2conjd2(in,size,out)		copy(in,size,out)
+#define d2conjd2(in,size,out)		copy_c(in,size,out)
 
 #define c2conjc2(in,size,out)		cconja(in, size[0]*size[1], out)
 
 #define z2conjz2(in,size,out)		zconja(in, size[0]*size[1], out)
 
-#define u82conju82(in,size,out)		copy(in,size,out)
+#define u82conju82(in,size,out)		copy_c(in,size,out)
 
-#define i82conji82(in,size,out)		copy(in,size,out)
+#define i82conji82(in,size,out)		copy_c(in,size,out)
 
-#define u162conju162(in,size,out)	copy(in,size,out)
+#define u162conju162(in,size,out)	copy_c(in,size,out)
 
-#define i162conji162(in,size,out)	copy(in,size,out)
+#define i162conji162(in,size,out)	copy_c(in,size,out)
 
 #endif /* !__INT_CONJ_H__ */
diff --git a/src/c/hardware/rasberrypi/libraries/libIlmImf.a b/src/c/hardware/rasberrypi/libraries/libIlmImf.a
new file mode 100644
index 0000000..0d9631d
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/libIlmImf.a
diff --git a/src/c/hardware/rasberrypi/libraries/libjasper.a b/src/c/hardware/rasberrypi/libraries/libjasper.a
index 6867f83..662e414 100644
--- a/src/c/hardware/rasberrypi/libraries/libjasper.a
+++ b/src/c/hardware/rasberrypi/libraries/libjasper.a
diff --git a/src/c/hardware/rasberrypi/libraries/libjpeg.a b/src/c/hardware/rasberrypi/libraries/libjpeg.a
index 4716fd8..e30c70c 100644
--- a/src/c/hardware/rasberrypi/libraries/libjpeg.a
+++ b/src/c/hardware/rasberrypi/libraries/libjpeg.a
diff --git a/src/c/hardware/rasberrypi/libraries/libpng.a b/src/c/hardware/rasberrypi/libraries/libpng.a
new file mode 100644
index 0000000..937cc22
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/libpng.a
diff --git a/src/c/hardware/rasberrypi/libraries/libpng.a.bkup b/src/c/hardware/rasberrypi/libraries/libpng.a.bkup
new file mode 100644
index 0000000..ae37076
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/libpng.a.bkup
diff --git a/src/c/hardware/rasberrypi/libraries/libtiff.a b/src/c/hardware/rasberrypi/libraries/libtiff.a
index 743428e..917d747 100644
--- a/src/c/hardware/rasberrypi/libraries/libtiff.a
+++ b/src/c/hardware/rasberrypi/libraries/libtiff.a
diff --git a/src/c/hardware/rasberrypi/libraries/libzlib.a b/src/c/hardware/rasberrypi/libraries/libzlib.a
new file mode 100644
index 0000000..5a64389
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/libzlib.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.a
new file mode 100644
index 0000000..5d69787
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.so
deleted file mode 100644
index 357be83..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.a
new file mode 100644
index 0000000..c2b4527
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.so
deleted file mode 100644
index 642ed00..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.a
new file mode 100644
index 0000000..1a7056f
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.so
deleted file mode 100644
index 900f46d..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.a
new file mode 100644
index 0000000..3bd21f2
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.so
deleted file mode 100644
index b4d4296..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.a
new file mode 100644
index 0000000..b5648fc
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.so
deleted file mode 100644
index b4af830..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.a
new file mode 100644
index 0000000..a3b093a
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.so
deleted file mode 100644
index c30af67..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_haartraining_engine.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_haartraining_engine.a
new file mode 100644
index 0000000..3a20f71
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_haartraining_engine.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.a
new file mode 100644
index 0000000..9b22dab
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.so
deleted file mode 100644
index 9a50229..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.a
new file mode 100644
index 0000000..3ae1ca0
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.so
deleted file mode 100644
index 28bd161..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.a
new file mode 100644
index 0000000..2d906d1
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.so
deleted file mode 100644
index 37d231f..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.a
new file mode 100644
index 0000000..5f6c164
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.so
deleted file mode 100644
index b31bf42..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.a
new file mode 100644
index 0000000..4f49c8d
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.so
deleted file mode 100644
index 53fdba2..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.a
new file mode 100644
index 0000000..6b3ddad
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.so
deleted file mode 100644
index 2fd4468..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.a
new file mode 100644
index 0000000..f5a4b42
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.so
deleted file mode 100644
index 6543e94..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.a
new file mode 100644
index 0000000..998a80a
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.so
deleted file mode 100644
index 4ef7a4e..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.a
new file mode 100644
index 0000000..aa0b1d3
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.so
deleted file mode 100644
index 8e4ed8e..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.a
new file mode 100644
index 0000000..d33df01
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.so
deleted file mode 100644
index 0233531..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a
index aea7e97..f701602 100644
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.a
new file mode 100644
index 0000000..c4a07bf
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.so
deleted file mode 100644
index 9c05c5d..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.so
+++ /dev/null
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.a b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.a
new file mode 100644
index 0000000..e2c302d
--- /dev/null
+++ b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.a
diff --git a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.so b/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.so
deleted file mode 100644
index a44efbc..0000000
--- a/src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.so
+++ /dev/null
diff --git a/src/c/imageProcessing/cvcore/imcvCreateImages.c b/src/c/imageProcessing/cvcore/imcvCreateImages.c
deleted file mode 100644
index 4543b72..0000000
--- a/src/c/imageProcessing/cvcore/imcvCreateImages.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 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: Siddhesh Wani
- Organization: FOSSEE, IIT Bombay
- Email: toolbox@scilab.in
-*/
-
-/* Function to create openCV image object from given specifications*/
-
-#include "types.h"
-#include "cvcore.h"
-#include <stdio.h>
-
-IplImage* imcvCreateImages(int width, int height, char *bit_depth, uint8 no_of_ch)
-{
-	CvSize imageSize = cvSize (width,height);
-	IplImage* img = NULL;
-	if (strcmp(bit_depth,"IPL_DEPTH_1U") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_1U,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_8U") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8U,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_8S") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8S,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_16U") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8U,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_16S") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8S,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_32U") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8U,no_of_ch);
-	else if (strcmp(bit_depth,"IPL_DEPTH_32S") == 0)
-		img = cvCreateImage(imageSize,IPL_DEPTH_8S,no_of_ch);
-
-	return img;
-} 
\ No newline at end of file
diff --git a/src/c/imageProcessing/cvcore/imcvCreateImages.cpp b/src/c/imageProcessing/cvcore/imcvCreateImages.cpp
new file mode 100644
index 0000000..a04e836
--- /dev/null
+++ b/src/c/imageProcessing/cvcore/imcvCreateImages.cpp
@@ -0,0 +1,46 @@
+/* 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: Siddhesh Wani
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+/* Function to create openCV image object from given specifications*/
+
+#include "types.h"
+#include "cvcore.hpp"
+#include <stdio.h>
+
+using namespace cv;
+using namespace std;
+
+Mat imcvCreateImages(int width, int height, char *bit_depth, uint8 no_of_ch)
+{
+	Mat img;
+	/*Create opencv matrix with given type*/
+	if (strcmp(bit_depth,"CV_8U") == 0)
+		img = Mat(height,width,CV_8U);
+	else if (strcmp(bit_depth,"CV_8S") == 0)
+		img = Mat(height,width,CV_8S);
+	else if (strcmp(bit_depth,"CV_16U") == 0)
+		img = Mat(height,width,CV_16U);
+	else if (strcmp(bit_depth,"CV_16S") == 0)
+		img = Mat(height,width,CV_16S);
+	else if (strcmp(bit_depth,"CV_32F") == 0)
+		img = Mat(height,width,CV_32F);
+	else if (strcmp(bit_depth,"CV_32S") == 0)
+		img = Mat(height,width,CV_32S);
+	else if (strcmp(bit_depth,"CV_64F") == 0)
+		img = Mat(height,width,CV_64F);
+	
+
+	/*Change no of channels to specified input*/
+	img.reshape(no_of_ch);
+	
+	return img;
+} 
\ No newline at end of file
diff --git a/src/c/imageProcessing/cvimgproc/imcvCvtColors.c b/src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp
index bc2a70e..0c4e848 100644
--- a/src/c/imageProcessing/cvimgproc/imcvCvtColors.c
+++ b/src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp
@@ -13,15 +13,15 @@
 /* Function to convert image object to other color space*/
 
 #include "types.h"
-#include "cvcore.h"
-#include "cvimgproc.h"
+#include "cvcore.hpp"
+#include "cvimgproc.hpp"
 #include <stdio.h>
 
-uint8 imcvCvtColors(IplImage* src, IplImage* dst, char* code)
-{
-
-	if(strcmp(code,"CV_BGR2GRAY") == 0)
-		cvCvtColor(src,dst,CV_RGB2GRAY);
+using namespace cv;
+using namespace std;
 
-	return 0;
+void imcvGetImgSizes(Mat src, double* imgsize)
+{
+		imgsize[0] = src.rows;
+		imgsize[1] = src.cols;	
 }
\ No newline at end of file
diff --git a/src/c/imageProcessing/cvhighgui/imcvLoadImages.c b/src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp
index 7c843f9..bf7ff07 100644
--- a/src/c/imageProcessing/cvhighgui/imcvLoadImages.c
+++ b/src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp
@@ -13,11 +13,11 @@
 /* Function to load image object from given filename*/
 
 #include "types.h"
-#include "cvcore.h"
-#include "cvhighgui.h"
+#include "cvcore.hpp"
+#include "cvhighgui.hpp"
 #include <stdio.h>
 
-IplImage* imcvLoadImages(char *filename, uint8 opentype)
+Mat imcvLoadImages(char *filename, uint8 opentype)
 {
-	return (cvLoadImage(filename,opentype));
+	return (imread(filename,opentype));
 } 
\ No newline at end of file
diff --git a/src/c/imageProcessing/cvhighgui/imcvShowImages.c b/src/c/imageProcessing/cvhighgui/imcvShowImages.cpp
index 82ae3ee..6179c3d 100644
--- a/src/c/imageProcessing/cvhighgui/imcvShowImages.c
+++ b/src/c/imageProcessing/cvhighgui/imcvShowImages.cpp
@@ -13,13 +13,15 @@
 /* Function to create show an image */
 
 #include "types.h"
-#include "cvcore.h"
-#include "cvhighgui.h"
+#include "cvcore.hpp"
+#include "cvhighgui.hpp"
 #include <stdio.h>
 
-uint8 imcvShowImages(char *winname, IplImage* img)
+using namespace cv;
+
+uint8 imcvShowImages(char *winname, Mat img)
 {
-	cvShowImage(winname,img);
+	imshow(winname,img);
 
 	return (0);
 } 
\ No newline at end of file
diff --git a/src/c/imageProcessing/cvcore/imcvGetImgSizes.c b/src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp
index 2faa627..1523afe 100644
--- a/src/c/imageProcessing/cvcore/imcvGetImgSizes.c
+++ b/src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp
@@ -13,20 +13,17 @@
 /* Function to convert image object to other color space*/
 
 #include "types.h"
-#include "cvcore.h"
-#include "cvimgproc.h"
+#include "cvcore.hpp"
+#include "cvimgproc.hpp"
 #include <stdio.h>
 
-void imcvGetImgSizes(IplImage* src, double* imgsize)
+using namespace cv;
+
+Mat imcvCvtColors(Mat src, char* code)
 {
-	if(src != NULL)
-	{
-		imgsize[0] = src->width;
-		imgsize[1] = src->height;
-	}
-	else
-	{
-		printf("Error with input image");
-	}
-	
+	Mat dst(src.rows, src.cols, src.type());
+	if(strcmp(code,"CV_RGB2GRAY") == 0)
+		cvtColor(src,dst,CV_RGB2GRAY);
+
+	return dst;
 }
\ No newline at end of file
diff --git a/src/c/imageProcessing/cvimgproc/imcvThresholds.c b/src/c/imageProcessing/cvimgproc/imcvThresholds.cpp
index cd66c52..2e40de9 100644
--- a/src/c/imageProcessing/cvimgproc/imcvThresholds.c
+++ b/src/c/imageProcessing/cvimgproc/imcvThresholds.cpp
@@ -13,15 +13,17 @@
 /* Function to threshold a gray scale image*/
 
 #include "types.h"
-#include "cvcore.h"
-#include "cvimgproc.h"
+#include "cvcore.hpp"
+#include "cvimgproc.hpp"
 #include <stdio.h>
 
-IplImage* imcvThresholds(IplImage* src, double threshold, double maxvalue, char* type)
+using namespace cv;
+
+Mat imcvThresholds(Mat src, double t_value, double maxvalue, char* type)
 {
-	dst = imcvCreates(src->width, src->height, src->,1);
-	if(strcmp(code,"CV_BGR2GRAY") == 0)
-		cvCvtColor(src,dst,CV_RGB2GRAY);
+	Mat dst(src.rows, src.cols, src.type());
+	if(strcmp(type,"THRESH_BINARY") == 0)
+		threshold(src,dst,t_value,maxvalue,THRESH_BINARY);
 
-	return 0;
+	return dst;
 }
\ No newline at end of file
diff --git a/src/c/imageProcessing/includes/core.h b/src/c/imageProcessing/includes/core.h
deleted file mode 100644
index 1e4c83c..0000000
--- a/src/c/imageProcessing/includes/core.h
+++ /dev/null
@@ -1,11 +0,0 @@
- /* 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: Siddhesh Wani
- Organization: FOSSEE, IIT Bombay
- Email: toolbox@scilab.in
- */
diff --git a/src/c/imageProcessing/includes/cvcore.h b/src/c/imageProcessing/includes/cvcore.hpp
index 4f04e58..78876f7 100644
--- a/src/c/imageProcessing/includes/cvcore.h
+++ b/src/c/imageProcessing/includes/cvcore.hpp
@@ -13,18 +13,14 @@
 #ifndef __CVCORE_H__
 #define __CVCORE_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 
 #include "types.h"
 #include "opencv2/core/core.hpp"
 
-IplImage* imcvCreateImages(int width, int height, char *bit_depth, uint8 no_of_ch);
-void imcvGetImgSizes(IplImage* src, double* imgsize);
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
+using namespace cv;
+
+Mat imcvCreateImages(int width, int height, char *bit_depth, uint8 no_of_ch);
+void imcvGetImgSizes(Mat src, double* imgsize);
+
 
 #endif  /*__CVCORE_H__*/
diff --git a/src/c/imageProcessing/includes/cvhighgui.h b/src/c/imageProcessing/includes/cvhighgui.hpp
index 2e959a5..167cb63 100644
--- a/src/c/imageProcessing/includes/cvhighgui.h
+++ b/src/c/imageProcessing/includes/cvhighgui.hpp
@@ -13,20 +13,14 @@
 #ifndef __CVHIGHGUI_H__
 #define __CVHIGHGUI_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
 #include "types.h"
 #include "opencv2/core/core.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
-IplImage* imcvLoadImages(char *filename, uint8 opentype);
-uint8 imcvShowImages(char *winname, IplImage* img);
+using namespace cv;
+
+Mat imcvLoadImages(char *filename, uint8 opentype);
+uint8 imcvShowImages(char *winname, Mat img);
 
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
 
 #endif  /*__CVCORE_H__*/
diff --git a/src/c/imageProcessing/includes/cvimgproc.h b/src/c/imageProcessing/includes/cvimgproc.hpp
index 5d982e4..b7d2faa 100644
--- a/src/c/imageProcessing/includes/cvimgproc.h
+++ b/src/c/imageProcessing/includes/cvimgproc.hpp
@@ -13,19 +13,13 @@
 #ifndef __CVIMGPROC_H__
 #define __CVIMGPROC_H__
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
 #include "types.h"
 #include "opencv2/core/core.hpp"	
 #include "opencv2/imgproc/imgproc.hpp"
 
-uint8 imcvCvtColor(IplImage* src, IplImage* dst, char* code);
+using namespace cv;
 
-#ifdef  __cplusplus
-} /* extern "C" */
-#endif
+Mat imcvCvtColors(Mat src, char* code);
+Mat imcvThresholds(Mat src, double threshold, double maxvalue, char* type);
 
 #endif  /*__CVIMGPROC_H__*/
diff --git a/src/c/imageProcessing/includes/temp.h b/src/c/imageProcessing/includes/temp.h
deleted file mode 100644
index 1e4c83c..0000000
--- a/src/c/imageProcessing/includes/temp.h
+++ /dev/null
@@ -1,11 +0,0 @@
- /* 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: Siddhesh Wani
- Organization: FOSSEE, IIT Bombay
- Email: toolbox@scilab.in
- */
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__*/