diff options
Diffstat (limited to 'src/c/imageProcessing/includes')
-rw-r--r-- | src/c/imageProcessing/includes/core.h | 11 | ||||
-rw-r--r-- | src/c/imageProcessing/includes/cvcore.hpp (renamed from src/c/imageProcessing/includes/cvcore.h) | 14 | ||||
-rw-r--r-- | src/c/imageProcessing/includes/cvhighgui.hpp (renamed from src/c/imageProcessing/includes/cvhighgui.h) | 14 | ||||
-rw-r--r-- | src/c/imageProcessing/includes/cvimgproc.hpp (renamed from src/c/imageProcessing/includes/cvimgproc.h) | 12 | ||||
-rw-r--r-- | src/c/imageProcessing/includes/temp.h | 11 |
5 files changed, 12 insertions, 50 deletions
diff --git a/src/c/imageProcessing/includes/core.h b/src/c/imageProcessing/includes/core.h deleted file mode 100644 index 1e4c83cb..00000000 --- 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 4f04e581..78876f7a 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 2e959a5d..167cb63a 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 5d982e49..b7d2faa2 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 1e4c83cb..00000000 --- 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 - */ |