From 2790257d385a9d7d9e0dab9205baf4b3df0dd8c8 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Mon, 29 Aug 2016 10:47:52 +0530 Subject: OpenCV interface changed from c to c++ --- includes/blas.h | 2 +- includes/sci2clib.h | 75 ++++++++------------- macros/CCodeGeneration/C_GenerateMakefile.bin | Bin 32812 -> 37204 bytes macros/CCodeGeneration/C_GenerateMakefile.sci | 59 +++++++++------- macros/CCodeGeneration/C_Type.bin | Bin 5740 -> 5716 bytes macros/CCodeGeneration/C_Type.sci | 4 +- macros/ImageProcessing/CV_CreateImage.bin | Bin 3564 -> 0 bytes macros/ImageProcessing/CV_CreateImage.sci | 41 ----------- macros/ImageProcessing/imgproc/CV_CvtColor.bin | Bin 4224 -> 3952 bytes macros/ImageProcessing/imgproc/CV_CvtColor.sci | 9 ++- macros/ImageProcessing/imgproc/CV_Threshold.bin | Bin 0 -> 4052 bytes macros/ImageProcessing/imgproc/CV_Threshold.sci | 42 ++++++++++++ macros/ImageProcessing/imgproc/lib | Bin 688 -> 712 bytes macros/ImageProcessing/imgproc/names | 1 + macros/ImageProcessing/lib | Bin 656 -> 0 bytes macros/ImageProcessing/names | 1 - .../ToolInitialization/INIT_FillSCI2LibCDirs.bin | Bin 1243008 -> 1247248 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 44 +++++++++--- macros/findDeps/getAllHeaders.bin | Bin 32772 -> 32796 bytes macros/findDeps/getAllHeaders.sci | 6 +- macros/findDeps/getAllInterfaces.bin | Bin 34096 -> 34120 bytes macros/findDeps/getAllInterfaces.sci | 6 +- macros/findDeps/getAllLibraries.bin | Bin 7740 -> 8928 bytes macros/findDeps/getAllLibraries.sci | 42 +++++++----- macros/findDeps/getAllSources.bin | Bin 193844 -> 194112 bytes macros/findDeps/getAllSources.sci | 11 +-- src/c/auxiliaryFunctions/interfaces/int_conj.h | 14 ++-- src/c/hardware/rasberrypi/libraries/libIlmImf.a | Bin 0 -> 2763492 bytes src/c/hardware/rasberrypi/libraries/libjasper.a | Bin 1029234 -> 423758 bytes src/c/hardware/rasberrypi/libraries/libjpeg.a | Bin 1119888 -> 243096 bytes src/c/hardware/rasberrypi/libraries/libpng.a | Bin 0 -> 252546 bytes src/c/hardware/rasberrypi/libraries/libpng.a.bkup | Bin 0 -> 252546 bytes src/c/hardware/rasberrypi/libraries/libtiff.a | Bin 1380758 -> 541798 bytes src/c/hardware/rasberrypi/libraries/libzlib.a | Bin 0 -> 120138 bytes .../libraries/opencv/libopencv_calib3d.a | Bin 0 -> 1085214 bytes .../libraries/opencv/libopencv_calib3d.so | Bin 3629128 -> 0 bytes .../libraries/opencv/libopencv_contrib.a | Bin 0 -> 1509928 bytes .../libraries/opencv/libopencv_contrib.so | Bin 6065088 -> 0 bytes .../rasberrypi/libraries/opencv/libopencv_core.a | Bin 0 -> 3816510 bytes .../rasberrypi/libraries/opencv/libopencv_core.so | Bin 7376312 -> 0 bytes .../libraries/opencv/libopencv_features2d.a | Bin 0 -> 1182146 bytes .../libraries/opencv/libopencv_features2d.so | Bin 4200032 -> 0 bytes .../rasberrypi/libraries/opencv/libopencv_flann.a | Bin 0 -> 1054510 bytes .../rasberrypi/libraries/opencv/libopencv_flann.so | Bin 2697296 -> 0 bytes .../rasberrypi/libraries/opencv/libopencv_gpu.a | Bin 0 -> 763098 bytes .../rasberrypi/libraries/opencv/libopencv_gpu.so | Bin 2619680 -> 0 bytes .../opencv/libopencv_haartraining_engine.a | Bin 0 -> 814832 bytes .../libraries/opencv/libopencv_highgui.a | Bin 0 -> 512558 bytes .../libraries/opencv/libopencv_highgui.so | Bin 7838352 -> 0 bytes .../libraries/opencv/libopencv_imgproc.a | Bin 0 -> 3248656 bytes .../libraries/opencv/libopencv_imgproc.so | Bin 7284984 -> 0 bytes .../rasberrypi/libraries/opencv/libopencv_legacy.a | Bin 0 -> 2066262 bytes .../libraries/opencv/libopencv_legacy.so | Bin 6518888 -> 0 bytes .../rasberrypi/libraries/opencv/libopencv_ml.a | Bin 0 -> 857478 bytes .../rasberrypi/libraries/opencv/libopencv_ml.so | Bin 1971600 -> 0 bytes .../libraries/opencv/libopencv_nonfree.a | Bin 0 -> 331496 bytes .../libraries/opencv/libopencv_nonfree.so | Bin 1091828 -> 0 bytes .../libraries/opencv/libopencv_objdetect.a | Bin 0 -> 814754 bytes .../libraries/opencv/libopencv_objdetect.so | Bin 3734856 -> 0 bytes .../rasberrypi/libraries/opencv/libopencv_ocl.a | Bin 0 -> 2814596 bytes .../rasberrypi/libraries/opencv/libopencv_ocl.so | Bin 7169952 -> 0 bytes .../rasberrypi/libraries/opencv/libopencv_photo.a | Bin 0 -> 153324 bytes .../rasberrypi/libraries/opencv/libopencv_photo.so | Bin 410344 -> 0 bytes .../libraries/opencv/libopencv_stitching.a | Bin 0 -> 825842 bytes .../libraries/opencv/libopencv_stitching.so | Bin 3714560 -> 0 bytes .../libraries/opencv/libopencv_superres.a | Bin 0 -> 436700 bytes .../libraries/opencv/libopencv_superres.so | Bin 1213364 -> 0 bytes .../rasberrypi/libraries/opencv/libopencv_ts.a | Bin 8438392 -> 1365686 bytes .../rasberrypi/libraries/opencv/libopencv_video.a | Bin 0 -> 465468 bytes .../rasberrypi/libraries/opencv/libopencv_video.so | Bin 1385940 -> 0 bytes .../libraries/opencv/libopencv_videostab.a | Bin 0 -> 439870 bytes .../libraries/opencv/libopencv_videostab.so | Bin 1473068 -> 0 bytes src/c/imageProcessing/cvcore/imcvCreateImages.c | 39 ----------- src/c/imageProcessing/cvcore/imcvCreateImages.cpp | 46 +++++++++++++ src/c/imageProcessing/cvcore/imcvGetImgSizes.c | 32 --------- src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp | 27 ++++++++ src/c/imageProcessing/cvhighgui/imcvLoadImages.c | 23 ------- src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp | 23 +++++++ src/c/imageProcessing/cvhighgui/imcvShowImages.c | 25 ------- src/c/imageProcessing/cvhighgui/imcvShowImages.cpp | 27 ++++++++ src/c/imageProcessing/cvimgproc/imcvCvtColors.c | 27 -------- src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp | 29 ++++++++ src/c/imageProcessing/cvimgproc/imcvThresholds.c | 27 -------- src/c/imageProcessing/cvimgproc/imcvThresholds.cpp | 29 ++++++++ src/c/imageProcessing/includes/core.h | 11 --- src/c/imageProcessing/includes/cvcore.h | 30 --------- src/c/imageProcessing/includes/cvcore.hpp | 26 +++++++ src/c/imageProcessing/includes/cvhighgui.h | 32 --------- src/c/imageProcessing/includes/cvhighgui.hpp | 26 +++++++ src/c/imageProcessing/includes/cvimgproc.h | 31 --------- src/c/imageProcessing/includes/cvimgproc.hpp | 25 +++++++ src/c/imageProcessing/includes/temp.h | 11 --- src/c/imageProcessing/interfaces/int_cvcore.h | 32 --------- src/c/imageProcessing/interfaces/int_cvcore.hpp | 26 +++++++ src/c/imageProcessing/interfaces/int_cvhighgui.h | 34 ---------- src/c/imageProcessing/interfaces/int_cvhighgui.hpp | 28 ++++++++ src/c/imageProcessing/interfaces/int_cvimgproc.h | 32 --------- src/c/imageProcessing/interfaces/int_cvimgproc.hpp | 24 +++++++ 98 files changed, 526 insertions(+), 553 deletions(-) delete mode 100644 macros/ImageProcessing/CV_CreateImage.bin delete mode 100644 macros/ImageProcessing/CV_CreateImage.sci create mode 100644 macros/ImageProcessing/imgproc/CV_Threshold.bin create mode 100644 macros/ImageProcessing/imgproc/CV_Threshold.sci delete mode 100644 macros/ImageProcessing/lib delete mode 100644 macros/ImageProcessing/names create mode 100644 src/c/hardware/rasberrypi/libraries/libIlmImf.a create mode 100644 src/c/hardware/rasberrypi/libraries/libpng.a create mode 100644 src/c/hardware/rasberrypi/libraries/libpng.a.bkup create mode 100644 src/c/hardware/rasberrypi/libraries/libzlib.a create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_haartraining_engine.a create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.so create mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.a delete mode 100644 src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.so delete mode 100644 src/c/imageProcessing/cvcore/imcvCreateImages.c create mode 100644 src/c/imageProcessing/cvcore/imcvCreateImages.cpp delete mode 100644 src/c/imageProcessing/cvcore/imcvGetImgSizes.c create mode 100644 src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp delete mode 100644 src/c/imageProcessing/cvhighgui/imcvLoadImages.c create mode 100644 src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp delete mode 100644 src/c/imageProcessing/cvhighgui/imcvShowImages.c create mode 100644 src/c/imageProcessing/cvhighgui/imcvShowImages.cpp delete mode 100644 src/c/imageProcessing/cvimgproc/imcvCvtColors.c create mode 100644 src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp delete mode 100644 src/c/imageProcessing/cvimgproc/imcvThresholds.c create mode 100644 src/c/imageProcessing/cvimgproc/imcvThresholds.cpp delete mode 100644 src/c/imageProcessing/includes/core.h delete mode 100644 src/c/imageProcessing/includes/cvcore.h create mode 100644 src/c/imageProcessing/includes/cvcore.hpp delete mode 100644 src/c/imageProcessing/includes/cvhighgui.h create mode 100644 src/c/imageProcessing/includes/cvhighgui.hpp delete mode 100644 src/c/imageProcessing/includes/cvimgproc.h create mode 100644 src/c/imageProcessing/includes/cvimgproc.hpp delete mode 100644 src/c/imageProcessing/includes/temp.h delete mode 100644 src/c/imageProcessing/interfaces/int_cvcore.h create mode 100644 src/c/imageProcessing/interfaces/int_cvcore.hpp delete mode 100644 src/c/imageProcessing/interfaces/int_cvhighgui.h create mode 100644 src/c/imageProcessing/interfaces/int_cvhighgui.hpp delete mode 100644 src/c/imageProcessing/interfaces/int_cvimgproc.h create mode 100644 src/c/imageProcessing/interfaces/int_cvimgproc.hpp diff --git a/includes/blas.h b/includes/blas.h index 86ab62f..f4b0bda 100644 --- a/includes/blas.h +++ b/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/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 #include #include -/* #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__ */ + + diff --git a/macros/CCodeGeneration/C_GenerateMakefile.bin b/macros/CCodeGeneration/C_GenerateMakefile.bin index ada2bb2..216107b 100644 Binary files a/macros/CCodeGeneration/C_GenerateMakefile.bin and b/macros/CCodeGeneration/C_GenerateMakefile.bin differ diff --git a/macros/CCodeGeneration/C_GenerateMakefile.sci b/macros/CCodeGeneration/C_GenerateMakefile.sci index f184c39..7ea2443 100644 --- a/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/macros/CCodeGeneration/C_GenerateMakefile.sci @@ -59,27 +59,35 @@ if getos() == 'Windows' then // Compiler definition PrintStringInfo('CC = gcc',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('CXX = g++',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR)',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS = -L./ -lblasplus -llapack -lm',FileInfo.MakefileFilename,'file','y','y'); //Added -L./ and -lblasplus(previously it was -lblas) else if (target == 'RPi') PrintStringInfo('CC = arm-linux-gnueabihf-gcc ',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('CXX = arm-linux-gnueabihf-g++ ',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y'); if(SharedInfo.OpenCVUsed == %T) - PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d -lopencv_flann',FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('LDFLAGS += -lopencv_gpu -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml',FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('LDFLAGS += -lopencv_nonfree -lopencv_objdetect -lopencv_ocl -lopencv_photo -lopencv_stitching',FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('LDFLAGS += -lopencv_superres -lopencv_ts -lopencv_video -lopencv_videostab -lrt -lpthread -lm -ldl', FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS += -lopencv_objdetect -lopencv_ocl -lopencv_photo -lopencv_stitching -lopencv_superres',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS += -lopencv_ts -lopencv_video -lopencv_videostab -lopencv_core -lrt -lpthread -lm -ldl', FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS += -lIlmImf -ljpeg -ljasper -ltiff -lpng -lzlib -lstdc++',FileInfo.MakefileFilename,'file','y','y'); end else PrintStringInfo('CC = gcc',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('CXX = g++',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y'); if(SharedInfo.OpenCVUsed == %T) PrintStringInfo('LDFLAGS += `pkg-config --libs opencv`',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('CXXFLAGS += `pkg-config --cflags opencv`',FileInfo.MakefileFilename,'file','y','y'); end end @@ -98,40 +106,42 @@ PrintStringInfo('EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)', FileInfo.MakefileFilenam // Sources //Check the output format selected and insert files according to it target = SharedInfo.Target; -PrintStringInfo('SRC = \\', FileInfo.MakefileFilename,'file','y','y'); -allSources = getAllSources(SharedInfo); -nbSources = size(allSources); +PrintStringInfo('SRC = $(wildcard $(CSRCDIR)/*.c)', FileInfo.MakefileFilename,'file','y','y'); +PrintStringInfo('SRCC = $(wildcard $(CSRCDIR)/*.cpp)', FileInfo.MakefileFilename,'file','y','y'); +// allSources = getAllSources(SharedInfo); +// nbSources = size(allSources); -for i = 1:(nbSources(1) - 1) - [tmppath,tmpfile,tmpext] = fileparts(allSources(i)); +// for i = 1:(nbSources(1) - 1) +// [tmppath,tmpfile,tmpext] = fileparts(allSources(i)); - if(~isempty(strstr(allSources(i),'dode'))) - if(size(SharedInfo.Includelist) <> 0) - if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T)) - PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y'); - end - end - else - PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y'); - end -end - -[tmppath,tmpfile,tmpext] = fileparts(allSources(nbSources(1))); -PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext, FileInfo.MakefileFilename,'file','y','y'); +// if(~isempty(strstr(allSources(i),'dode'))) +// if(size(SharedInfo.Includelist) <> 0) +// if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T)) +// PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y'); +// end +// end +// else +// PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext+' \\', FileInfo.MakefileFilename,'file','y','y'); +// end +// end + +// [tmppath,tmpfile,tmpext] = fileparts(allSources(nbSources(1))); +// PrintStringInfo(' $(CSRCDIR)/'+tmpfile+tmpext, FileInfo.MakefileFilename,'file','y','y'); // Objects PrintStringInfo('OBJ = $(SRC:.c=.o)', FileInfo.MakefileFilename,'file','y','y'); +PrintStringInfo('OBJC = $(SRCC:.cpp=.o)', FileInfo.MakefileFilename,'file','y','y'); // Rules PrintStringInfo('# ---------------',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('# --- TARGETS ---',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('# ---------------',FileInfo.MakefileFilename,'file','y','y'); -PrintStringInfo('compileexecute: $(OBJ)',FileInfo.MakefileFilename,'file','y','y'); +PrintStringInfo('compileexecute: $(OBJ) $(OBJC)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo "" ""',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo ""============================""',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo ""Generation of the executable""',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo ""============================""',FileInfo.MakefileFilename,'file','y','y'); -PrintStringInfo('\t$(CC) $(CFLAGS) $(OBJ) *.c $(LDFLAGS) -o $(EXEFILE)',FileInfo.MakefileFilename,'file','y','y'); +PrintStringInfo('\t$(CXX) $(CFLAGS) $(OBJ) $(OBJC) *.c $(LDFLAGS) -o $(EXEFILE)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo "" ""',FileInfo.MakefileFilename,'file','y','y'); if(target == "StandAlone") PrintStringInfo('\t@echo ""==============""',FileInfo.MakefileFilename,'file','y','y'); @@ -146,6 +156,7 @@ PrintStringInfo('\t@echo ""Removing only exe + obj files""',FileInfo.MakefileFil PrintStringInfo('\t@echo ""=============================""',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\trm -rf $(EXEFILE)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\trm -rf $(OBJ)',FileInfo.MakefileFilename,'file','y','y'); +PrintStringInfo('\trm -rf $(OBJC)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('\t@echo "" ""',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('distclean: clean',FileInfo.MakefileFilename,'file','y','y'); diff --git a/macros/CCodeGeneration/C_Type.bin b/macros/CCodeGeneration/C_Type.bin index 78311b6..fd02434 100644 Binary files a/macros/CCodeGeneration/C_Type.bin and b/macros/CCodeGeneration/C_Type.bin differ diff --git a/macros/CCodeGeneration/C_Type.sci b/macros/CCodeGeneration/C_Type.sci index 60a3f8b..13cf6de 100644 --- a/macros/CCodeGeneration/C_Type.sci +++ b/macros/CCodeGeneration/C_Type.sci @@ -50,8 +50,8 @@ elseif (ArgType == 'i32') elseif (ArgType == 'fn') //This type introduced for ODE function, // as it's one of the inout argument is name of the other function OutC_Type = ''; -elseif (ArgType == 'im') - OutC_Type = 'IplImage*' +elseif (ArgType == 'mt') + OutC_Type = 'Mat' else error(9999, 'Unknown Argument Type: ""'+ArgType+'"".'); end diff --git a/macros/ImageProcessing/CV_CreateImage.bin b/macros/ImageProcessing/CV_CreateImage.bin deleted file mode 100644 index 4c638cc..0000000 Binary files a/macros/ImageProcessing/CV_CreateImage.bin and /dev/null differ diff --git a/macros/ImageProcessing/CV_CreateImage.sci b/macros/ImageProcessing/CV_CreateImage.sci deleted file mode 100644 index 85c01a4..0000000 --- a/macros/ImageProcessing/CV_CreateImage.sci +++ /dev/null @@ -1,41 +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 img = CV_CreateImage(width,height,bit_depth,no_of_channels) -// function to create an image object of given size and type -// -// Calling Sequence -// CV_CreateImage(image_size,bit_depth,no_of_channels) -// -// Parameters -// image_size: width and height of image -// bit_depth: Bit depth of image elements -// no_of_channels: no of channels per pixels -// -// Description -// This function can be used to create opencv image object. For more info -// about bit depth and channels,please refer to OpenCV documentation -// Examples -// CV_CreateImage([320 240], "8U", 1) //to create image of the size 320*240 -// pixels with 8 bit unsigned each pixels and gray scale image -// -// See also -// CV_LoadImage -// -// -// Authors -// Siddhesh Wani -// -img = 0; -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV - -endfunction diff --git a/macros/ImageProcessing/imgproc/CV_CvtColor.bin b/macros/ImageProcessing/imgproc/CV_CvtColor.bin index 6ca6ea4..eee1018 100644 Binary files a/macros/ImageProcessing/imgproc/CV_CvtColor.bin and b/macros/ImageProcessing/imgproc/CV_CvtColor.bin differ diff --git a/macros/ImageProcessing/imgproc/CV_CvtColor.sci b/macros/ImageProcessing/imgproc/CV_CvtColor.sci index 8baa386..220ad5f 100644 --- a/macros/ImageProcessing/imgproc/CV_CvtColor.sci +++ b/macros/ImageProcessing/imgproc/CV_CvtColor.sci @@ -9,11 +9,11 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in -function status = CV_CvtColor(srcimg,dstimg,code) +function cvtimg = CV_CvtColor(srcimg,code) // function to convert image from one colorspace to other colorspace // // Calling Sequence -// CV_CvtColor(srcimg,dstimg,code,dstCn) +// CV_CvtColor(srcimg,code) // // Parameters // srcimg: source image to be converted @@ -27,8 +27,7 @@ function status = CV_CvtColor(srcimg,dstimg,code) // Refer OpenCV documentation for list of available conversions // Examples // img = CV_LoadImage('~/test.jpg',0) -// dst = CV_CreateImage(320,240,"IPL_DEPTH_8U",1) -// CV_CvtColor(img,dst,'CV_RGB2GRAY') +// dst = CV_CvtColor(img,'CV_RGB2GRAY') // // See also // CV_LoadImage CV_CreateImage @@ -36,7 +35,7 @@ function status = CV_CvtColor(srcimg,dstimg,code) // Authors // Siddhesh Wani // -status = 0; +cvtimg = 0 // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV diff --git a/macros/ImageProcessing/imgproc/CV_Threshold.bin b/macros/ImageProcessing/imgproc/CV_Threshold.bin new file mode 100644 index 0000000..c2ce1c6 Binary files /dev/null and b/macros/ImageProcessing/imgproc/CV_Threshold.bin differ diff --git a/macros/ImageProcessing/imgproc/CV_Threshold.sci b/macros/ImageProcessing/imgproc/CV_Threshold.sci new file mode 100644 index 0000000..343fde5 --- /dev/null +++ b/macros/ImageProcessing/imgproc/CV_Threshold.sci @@ -0,0 +1,42 @@ +// 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 cvtimg = CV_Threshold(srcimg,threshold,max_value,thresh_type) +// function to threshold input image +// +// Calling Sequence +// dst = CV_Threshold(srcimg,code,threshold,max_value,thresh_type) +// +// Parameters +// srcimg: source image to be converted +// threshold: threshold value +// max_value: maximum value to be used with THRESH_BINARY and THRESH_BINARY_INV +// thresh_type: Type for threshold. It can one of the following: +// THRESH_BINARY, THRESH_BINARY_INV, THRESH_TRUNC, +// THRESH_TOZERO, THRESH_TOZERO_INV +// Description +// This function can be used for converting an image to other colorspace. +// Refer OpenCV documentation for list of available conversions +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// dst = CV_Threshold(img,100,255,'THRESH_BINARY') +// +// See also +// CV_LoadImage CV_CreateImage +// +// Authors +// Siddhesh Wani +// +cvtimg = 0 +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for OpenCV + +endfunction diff --git a/macros/ImageProcessing/imgproc/lib b/macros/ImageProcessing/imgproc/lib index 601946e..173bc66 100644 Binary files a/macros/ImageProcessing/imgproc/lib and b/macros/ImageProcessing/imgproc/lib differ diff --git a/macros/ImageProcessing/imgproc/names b/macros/ImageProcessing/imgproc/names index 537af89..31074fe 100644 --- a/macros/ImageProcessing/imgproc/names +++ b/macros/ImageProcessing/imgproc/names @@ -1 +1,2 @@ CV_CvtColor +CV_Threshold diff --git a/macros/ImageProcessing/lib b/macros/ImageProcessing/lib deleted file mode 100644 index d374b90..0000000 Binary files a/macros/ImageProcessing/lib and /dev/null differ diff --git a/macros/ImageProcessing/names b/macros/ImageProcessing/names deleted file mode 100644 index a681f79..0000000 --- a/macros/ImageProcessing/names +++ /dev/null @@ -1 +0,0 @@ -CV_CreateImage diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin index 8e23886..8ac49ac 100644 Binary files a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin and b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index ac8d823..164a7c7 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -5543,12 +5543,12 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 4',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''im''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0g2d0'+ArgSeparator+'im0',ClassFileName,'file','y'); +PrintStringInfo('d0d0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'CV_CreateImage'; @@ -5567,12 +5567,12 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''im''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('g2d0'+ArgSeparator+'im0',ClassFileName,'file','y'); +PrintStringInfo('g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'CV_LoadImage'; @@ -5602,8 +5602,8 @@ PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('g2im0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('im0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('g2mt0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('mt0'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'CV_ShowImage'; @@ -5649,14 +5649,14 @@ ClassName = 'CV_CvtColor'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); -PrintStringInfo('NIN= 3',ClassFileName,'file','y'); +PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); -PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('im0im0g2'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('mt0g2'+ArgSeparator+'mt0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'CV_CvtColor'; @@ -5680,7 +5680,7 @@ PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y'); ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('im0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('mt0'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'CV_GetImgSize'; @@ -5688,6 +5688,30 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); +//------------------------------------ +//---- Class CV_Threshold ----------- +//------------------------------------ +ClassName = 'CV_Threshold'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +PrintStringInfo('NIN= 4',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); + +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('mt0d0d0g2'+ArgSeparator+'mt0',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'CV_Threshold'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + // //////////////////////////////////////////// // /////PARTE INTRODOTTA DA ALBERTO MOREA // ///////////////////////////////////////////// diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin index e934bc3..05e6c7e 100644 Binary files a/macros/findDeps/getAllHeaders.bin and b/macros/findDeps/getAllHeaders.bin differ diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci index 06963ca..bbc0890 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/macros/findDeps/getAllHeaders.sci @@ -181,9 +181,9 @@ function allHeaders = getAllHeaders(SharedInfo) ]; OpenCV_headers = [ - "src/c/imageProcessing/includes/cvcore.h" - "src/c/imageProcessing/includes/cvhighgui.h" - "src/c/imageProcessing/includes/cvimgproc.h"]; + "src/c/imageProcessing/includes/cvcore.hpp" + "src/c/imageProcessing/includes/cvhighgui.hpp" + "src/c/imageProcessing/includes/cvimgproc.hpp"]; if Target == "StandAlone" allHeaders = Standalone_headers; diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin index c46573a..c22a1b6 100644 Binary files a/macros/findDeps/getAllInterfaces.bin and b/macros/findDeps/getAllInterfaces.bin differ diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci index 0f90d5c..2bdc8b7 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -172,9 +172,9 @@ function allInterfaces = getAllInterfaces(SharedInfo) ]; OpenCV_interfaces = [ - "src/c/imageProcessing/interfaces/int_cvcore.h" - "src/c/imageProcessing/interfaces/int_cvhighgui.h" - "src/c/imageProcessing/interfaces/int_cvimgproc.h"]; + "src/c/imageProcessing/interfaces/int_cvcore.hpp" + "src/c/imageProcessing/interfaces/int_cvhighgui.hpp" + "src/c/imageProcessing/interfaces/int_cvimgproc.hpp"]; if Target == "StandAlone" allInterfaces = Standalone_interfaces; diff --git a/macros/findDeps/getAllLibraries.bin b/macros/findDeps/getAllLibraries.bin index f016eba..718e2b1 100644 Binary files a/macros/findDeps/getAllLibraries.bin and b/macros/findDeps/getAllLibraries.bin differ diff --git a/macros/findDeps/getAllLibraries.sci b/macros/findDeps/getAllLibraries.sci index 2850aba..7ac9e5b 100644 --- a/macros/findDeps/getAllLibraries.sci +++ b/macros/findDeps/getAllLibraries.sci @@ -11,25 +11,31 @@ function allLibraries = getAllLibraries(SharedInfo) ]; RPi_cvlibs = [ - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.so" - "src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.so" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_calib3d.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_contrib.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_core.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_features2d.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_flann.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_gpu.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_highgui.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_imgproc.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_legacy.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ml.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_nonfree.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_objdetect.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ocl.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_photo.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_stitching.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_superres.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_video.a" + "src/c/hardware/rasberrypi/libraries/opencv/libopencv_videostab.a" "src/c/hardware/rasberrypi/libraries/opencv/libopencv_ts.a" + "src/c/hardware/rasberrypi/libraries/libjpeg.a" + "src/c/hardware/rasberrypi/libraries/libjasper.a" + "src/c/hardware/rasberrypi/libraries/libpng.a" + "src/c/hardware/rasberrypi/libraries/libIlmImf.a" + "src/c/hardware/rasberrypi/libraries/libzlib.a" + "src/c/hardware/rasberrypi/libraries/libtiff.a" ]; if Target == "RPi" diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin index a6612ba..9d7f5ba 100644 Binary files a/macros/findDeps/getAllSources.bin and b/macros/findDeps/getAllSources.bin differ diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index 14326b6..aaaf4be 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -1039,11 +1039,12 @@ function allSources = getAllSources(SharedInfo) ]; OpenCV_files = [ - "src/c/imageProcessing/cvcore/imcvCreateImages.c" - "src/c/imageProcessing/cvcore/imcvGetImgSizes.c" - "src/c/imageProcessing/cvhighgui/imcvLoadImages.c" - "src/c/imageProcessing/cvhighgui/imcvShowImages.c" - "src/c/imageProcessing/cvimgproc/imcvCvtColors.c"]; + "src/c/imageProcessing/cvcore/imcvCreateImages.cpp" + "src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp" + "src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp" + "src/c/imageProcessing/cvhighgui/imcvShowImages.cpp" + "src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp" + "src/c/imageProcessing/cvimgproc/imcvThresholds.cpp"]; if Target == "StandAlone" allSources = Standalone_files; 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 - -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 + +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/cvcore/imcvGetImgSizes.c b/src/c/imageProcessing/cvcore/imcvGetImgSizes.c deleted file mode 100644 index 2faa627..0000000 --- a/src/c/imageProcessing/cvcore/imcvGetImgSizes.c +++ /dev/null @@ -1,32 +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 convert image object to other color space*/ - -#include "types.h" -#include "cvcore.h" -#include "cvimgproc.h" -#include - -void imcvGetImgSizes(IplImage* src, double* imgsize) -{ - if(src != NULL) - { - imgsize[0] = src->width; - imgsize[1] = src->height; - } - else - { - printf("Error with input image"); - } - -} \ No newline at end of file diff --git a/src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp b/src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp new file mode 100644 index 0000000..0c4e848 --- /dev/null +++ b/src/c/imageProcessing/cvcore/imcvGetImgSizes.cpp @@ -0,0 +1,27 @@ +/* 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 convert image object to other color space*/ + +#include "types.h" +#include "cvcore.hpp" +#include "cvimgproc.hpp" +#include + +using namespace cv; +using namespace std; + +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.c deleted file mode 100644 index 7c843f9..0000000 --- a/src/c/imageProcessing/cvhighgui/imcvLoadImages.c +++ /dev/null @@ -1,23 +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 load image object from given filename*/ - -#include "types.h" -#include "cvcore.h" -#include "cvhighgui.h" -#include - -IplImage* imcvLoadImages(char *filename, uint8 opentype) -{ - return (cvLoadImage(filename,opentype)); -} \ No newline at end of file diff --git a/src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp b/src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp new file mode 100644 index 0000000..bf7ff07 --- /dev/null +++ b/src/c/imageProcessing/cvhighgui/imcvLoadImages.cpp @@ -0,0 +1,23 @@ +/* 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 load image object from given filename*/ + +#include "types.h" +#include "cvcore.hpp" +#include "cvhighgui.hpp" +#include + +Mat imcvLoadImages(char *filename, uint8 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.c deleted file mode 100644 index 82ae3ee..0000000 --- a/src/c/imageProcessing/cvhighgui/imcvShowImages.c +++ /dev/null @@ -1,25 +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 show an image */ - -#include "types.h" -#include "cvcore.h" -#include "cvhighgui.h" -#include - -uint8 imcvShowImages(char *winname, IplImage* img) -{ - cvShowImage(winname,img); - - return (0); -} \ No newline at end of file diff --git a/src/c/imageProcessing/cvhighgui/imcvShowImages.cpp b/src/c/imageProcessing/cvhighgui/imcvShowImages.cpp new file mode 100644 index 0000000..6179c3d --- /dev/null +++ b/src/c/imageProcessing/cvhighgui/imcvShowImages.cpp @@ -0,0 +1,27 @@ +/* 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 show an image */ + +#include "types.h" +#include "cvcore.hpp" +#include "cvhighgui.hpp" +#include + +using namespace cv; + +uint8 imcvShowImages(char *winname, Mat img) +{ + imshow(winname,img); + + return (0); +} \ No newline at end of file diff --git a/src/c/imageProcessing/cvimgproc/imcvCvtColors.c b/src/c/imageProcessing/cvimgproc/imcvCvtColors.c deleted file mode 100644 index bc2a70e..0000000 --- a/src/c/imageProcessing/cvimgproc/imcvCvtColors.c +++ /dev/null @@ -1,27 +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 convert image object to other color space*/ - -#include "types.h" -#include "cvcore.h" -#include "cvimgproc.h" -#include - -uint8 imcvCvtColors(IplImage* src, IplImage* dst, char* code) -{ - - if(strcmp(code,"CV_BGR2GRAY") == 0) - cvCvtColor(src,dst,CV_RGB2GRAY); - - return 0; -} \ No newline at end of file diff --git a/src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp b/src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp new file mode 100644 index 0000000..1523afe --- /dev/null +++ b/src/c/imageProcessing/cvimgproc/imcvCvtColors.cpp @@ -0,0 +1,29 @@ +/* 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 convert image object to other color space*/ + +#include "types.h" +#include "cvcore.hpp" +#include "cvimgproc.hpp" +#include + +using namespace cv; + +Mat imcvCvtColors(Mat src, char* code) +{ + 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.c deleted file mode 100644 index cd66c52..0000000 --- a/src/c/imageProcessing/cvimgproc/imcvThresholds.c +++ /dev/null @@ -1,27 +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 threshold a gray scale image*/ - -#include "types.h" -#include "cvcore.h" -#include "cvimgproc.h" -#include - -IplImage* imcvThresholds(IplImage* src, double threshold, double maxvalue, char* type) -{ - dst = imcvCreates(src->width, src->height, src->,1); - if(strcmp(code,"CV_BGR2GRAY") == 0) - cvCvtColor(src,dst,CV_RGB2GRAY); - - return 0; -} \ No newline at end of file diff --git a/src/c/imageProcessing/cvimgproc/imcvThresholds.cpp b/src/c/imageProcessing/cvimgproc/imcvThresholds.cpp new file mode 100644 index 0000000..2e40de9 --- /dev/null +++ b/src/c/imageProcessing/cvimgproc/imcvThresholds.cpp @@ -0,0 +1,29 @@ +/* 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 threshold a gray scale image*/ + +#include "types.h" +#include "cvcore.hpp" +#include "cvimgproc.hpp" +#include + +using namespace cv; + +Mat imcvThresholds(Mat src, double t_value, double maxvalue, char* type) +{ + Mat dst(src.rows, src.cols, src.type()); + if(strcmp(type,"THRESH_BINARY") == 0) + threshold(src,dst,t_value,maxvalue,THRESH_BINARY); + + 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.h deleted file mode 100644 index 4f04e58..0000000 --- a/src/c/imageProcessing/includes/cvcore.h +++ /dev/null @@ -1,30 +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 -*/ - -#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 - -#endif /*__CVCORE_H__*/ diff --git a/src/c/imageProcessing/includes/cvcore.hpp b/src/c/imageProcessing/includes/cvcore.hpp new file mode 100644 index 0000000..78876f7 --- /dev/null +++ b/src/c/imageProcessing/includes/cvcore.hpp @@ -0,0 +1,26 @@ +/* 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 +*/ + +#ifndef __CVCORE_H__ +#define __CVCORE_H__ + + +#include "types.h" +#include "opencv2/core/core.hpp" + +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.h deleted file mode 100644 index 2e959a5..0000000 --- a/src/c/imageProcessing/includes/cvhighgui.h +++ /dev/null @@ -1,32 +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 -*/ - -#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); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__CVCORE_H__*/ diff --git a/src/c/imageProcessing/includes/cvhighgui.hpp b/src/c/imageProcessing/includes/cvhighgui.hpp new file mode 100644 index 0000000..167cb63 --- /dev/null +++ b/src/c/imageProcessing/includes/cvhighgui.hpp @@ -0,0 +1,26 @@ +/* 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 +*/ + +#ifndef __CVHIGHGUI_H__ +#define __CVHIGHGUI_H__ + +#include "types.h" +#include "opencv2/core/core.hpp" +#include "opencv2/highgui/highgui.hpp" + +using namespace cv; + +Mat imcvLoadImages(char *filename, uint8 opentype); +uint8 imcvShowImages(char *winname, Mat img); + + +#endif /*__CVCORE_H__*/ diff --git a/src/c/imageProcessing/includes/cvimgproc.h b/src/c/imageProcessing/includes/cvimgproc.h deleted file mode 100644 index 5d982e4..0000000 --- a/src/c/imageProcessing/includes/cvimgproc.h +++ /dev/null @@ -1,31 +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 -*/ - -#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); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__CVIMGPROC_H__*/ diff --git a/src/c/imageProcessing/includes/cvimgproc.hpp b/src/c/imageProcessing/includes/cvimgproc.hpp new file mode 100644 index 0000000..b7d2faa --- /dev/null +++ b/src/c/imageProcessing/includes/cvimgproc.hpp @@ -0,0 +1,25 @@ +/* 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 +*/ + +#ifndef __CVIMGPROC_H__ +#define __CVIMGPROC_H__ + +#include "types.h" +#include "opencv2/core/core.hpp" +#include "opencv2/imgproc/imgproc.hpp" + +using namespace cv; + +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.h deleted file mode 100644 index 5ae0055..0000000 --- a/src/c/imageProcessing/interfaces/int_cvcore.h +++ /dev/null @@ -1,32 +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 -*/ - -#ifndef __INT_CVCORE_H__ -#define __INT_CVCORE_H__ - -#ifdef __cplusplus -extern "C" { -#endif - - -#include "types.h" -#include "cvcore.h" - -#define d0d0g2d0CV_CreateImageim0(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 - -#endif /*__INT_CVCORE_H__*/ diff --git a/src/c/imageProcessing/interfaces/int_cvcore.hpp b/src/c/imageProcessing/interfaces/int_cvcore.hpp new file mode 100644 index 0000000..82c1313 --- /dev/null +++ b/src/c/imageProcessing/interfaces/int_cvcore.hpp @@ -0,0 +1,26 @@ +/* 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 +*/ + +#ifndef __INT_CVCORE_H__ +#define __INT_CVCORE_H__ + + +#include "types.h" +#include "cvcore.hpp" + +#define d0d0g2d0CV_CreateImagemt0(width,height,depth,depth_size,no_of_ch) \ + imcvCreateImages(width,height,depth,no_of_ch) + +#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.h deleted file mode 100644 index d8ecf1c..0000000 --- a/src/c/imageProcessing/interfaces/int_cvhighgui.h +++ /dev/null @@ -1,34 +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 -*/ - -#ifndef __INT_CVHIGHGUI_H__ -#define __INT_CVHIGHGUI_H__ - -#ifdef __cplusplus -extern "C" { -#endif - - -#include "types.h" -#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 d0CV_WaitKeyu80(delay) cvWaitKey(delay) -#define g2im0CV_SaveImageu80(filename,name_size,img) cvSaveImage(filename,img,NULL) - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__INT_CVHIGHGUI_H__*/ diff --git a/src/c/imageProcessing/interfaces/int_cvhighgui.hpp b/src/c/imageProcessing/interfaces/int_cvhighgui.hpp new file mode 100644 index 0000000..05f260f --- /dev/null +++ b/src/c/imageProcessing/interfaces/int_cvhighgui.hpp @@ -0,0 +1,28 @@ +/* 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 +*/ + +#ifndef __INT_CVHIGHGUI_H__ +#define __INT_CVHIGHGUI_H__ + + +#include "types.h" +#include "opencv2/core/core.hpp" +#include "opencv2/highgui/highgui.hpp" + +//#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 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.h deleted file mode 100644 index 47192e1..0000000 --- a/src/c/imageProcessing/interfaces/int_cvimgproc.h +++ /dev/null @@ -1,32 +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 -*/ - -#ifndef __INT_CVIMGPROC_H__ -#define __INT_CVIMGPROC_H__ - -#ifdef __cplusplus -extern "C" { -#endif - - -#include "types.h" -#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 - -#endif /*__INT_CVIMGPROC_H__*/ diff --git a/src/c/imageProcessing/interfaces/int_cvimgproc.hpp b/src/c/imageProcessing/interfaces/int_cvimgproc.hpp new file mode 100644 index 0000000..65fa77e --- /dev/null +++ b/src/c/imageProcessing/interfaces/int_cvimgproc.hpp @@ -0,0 +1,24 @@ +/* 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 +*/ + +#ifndef __INT_CVIMGPROC_H__ +#define __INT_CVIMGPROC_H__ + +#include "types.h" +#include "opencv2/core/core.hpp" +#include "opencv2/imgproc/imgproc.hpp" + +#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__*/ -- cgit