diff options
author | siddhu8990 | 2016-08-25 10:29:32 +0530 |
---|---|---|
committer | siddhu8990 | 2016-08-25 10:29:32 +0530 |
commit | 425ae9b5508196bc39ab98f12696550dfa6f872c (patch) | |
tree | ba140cadce2eb1e927e84b94653ef5ff83707827 /2.3-1/macros | |
parent | 0b014f0b667df241a3b0fa575f11577d453d08f8 (diff) | |
download | Scilab2C-425ae9b5508196bc39ab98f12696550dfa6f872c.tar.gz Scilab2C-425ae9b5508196bc39ab98f12696550dfa6f872c.tar.bz2 Scilab2C-425ae9b5508196bc39ab98f12696550dfa6f872c.zip |
Basic image prcessing working for RPi
Diffstat (limited to '2.3-1/macros')
26 files changed, 203 insertions, 26 deletions
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin Binary files differindex efa5cd65..ada2bb27 100644 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci index a9156168..f184c39c 100644 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci @@ -66,11 +66,21 @@ else if (target == 'RPi') PrintStringInfo('CC = arm-linux-gnueabihf-gcc ',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lm -lwiringPi',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'); + end else PrintStringInfo('CC = gcc',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CFLAGS = -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'); + end end end @@ -81,11 +91,6 @@ if(size(SharedInfo.Includelist) <> 0) end end -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'); -end - // Binary definition PrintStringInfo('EXEFILENAME = '+SharedInfo.SCIMainFunName,FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)', FileInfo.MakefileFilename,'file','y','y'); diff --git a/2.3-1/macros/ImageProcessing/buildmacros.sce b/2.3-1/macros/ImageProcessing/buildmacros.sce index 14c7c1b1..6431a7df 100644 --- a/2.3-1/macros/ImageProcessing/buildmacros.sce +++ b/2.3-1/macros/ImageProcessing/buildmacros.sce @@ -9,8 +9,9 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in -OpencvDirs = [ "core", ... - "highgui"]; +OpencvDirs = [ "core", ... + "highgui", ... + "imgproc"]; current_path = get_absolute_file_path("buildmacros.sce"); @@ -23,8 +24,3 @@ OpencvDirs = [ "core", ... end clear current_path; - -tbx_build_macros(TOOLBOX_NAME, get_absolute_file_path('buildmacros.sce')); - -clear tbx_build_macros; - diff --git a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.bin b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.bin Binary files differindex 4c638cc2..d5aa3080 100644 --- a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.bin +++ b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.bin diff --git a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci index 49649201..72dd9b8c 100644 --- a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci +++ b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci @@ -13,7 +13,7 @@ function img = CV_CreateImage(width,height,bit_depth,no_of_channels) // 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 +// CV_CreateImage([320 240], "IPL_DEPTH_8U", 1) //to create image of the size 320*240 // pixels with 8 bit unsigned each pixels and gray scale image // // See also diff --git a/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.bin b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.bin Binary files differnew file mode 100644 index 00000000..ede60e6f --- /dev/null +++ b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.bin diff --git a/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci new file mode 100644 index 00000000..cd7ebdaf --- /dev/null +++ b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci @@ -0,0 +1,38 @@ +// 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 imgsize = CV_GetImgSize(img) +// function to get size of the image (width*height) +// +// Calling Sequence +// CV_GetImgSize(img) +// +// Parameters +// img: image whose size is to be returned +// +// Description +// This function can be used for retriving size information of the image. +// It returs an array with first image element as width and second as height +// Examples +// img = CV_LoadImage('~/test.jpg',0) +// size = CV_GetImgSize(img) +// +// See also +// CV_LoadImage CV_CreateImage +// +// Authors +// Siddhesh Wani +// +imgsize = [0 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/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib Binary files differindex 4bccbc8b..8d5e5c74 100644 --- a/2.3-1/macros/ImageProcessing/core/lib +++ b/2.3-1/macros/ImageProcessing/core/lib diff --git a/2.3-1/macros/ImageProcessing/core/names b/2.3-1/macros/ImageProcessing/core/names index a681f790..f56c951c 100644 --- a/2.3-1/macros/ImageProcessing/core/names +++ b/2.3-1/macros/ImageProcessing/core/names @@ -1 +1,2 @@ CV_CreateImage +CV_GetImgSize diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin Binary files differnew file mode 100644 index 00000000..6ca6ea46 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci new file mode 100644 index 00000000..8baa3865 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci @@ -0,0 +1,43 @@ +// 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 status = CV_CvtColor(srcimg,dstimg,code) +// function to convert image from one colorspace to other colorspace +// +// Calling Sequence +// CV_CvtColor(srcimg,dstimg,code,dstCn) +// +// Parameters +// srcimg: source image to be converted +// dstimg: destination image in which to store converted image +// code: String specifying conversion type. Same as defined in OpenCV +// for eg. 'CV_RGB2GRAY' for conversion from RGB image to grayscale image +// dstCn: no of channels in destination image (0 by default) +// +// 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_CreateImage(320,240,"IPL_DEPTH_8U",1) +// CV_CvtColor(img,dst,'CV_RGB2GRAY') +// +// See also +// CV_LoadImage CV_CreateImage +// +// Authors +// Siddhesh Wani +// +status = 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/2.3-1/macros/ImageProcessing/imgproc/buildmacros.sce b/2.3-1/macros/ImageProcessing/imgproc/buildmacros.sce new file mode 100644 index 00000000..60fd2843 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/buildmacros.sce @@ -0,0 +1,15 @@ +// +// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab +// Copyright (C) 2009-2009 - DIGITEO - Bruno JOFRET +// +// 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 +// +// + +tbx_build_macros(TOOLBOX_NAME, get_absolute_file_path('buildmacros.sce')); + +clear tbx_build_macros; diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib Binary files differnew file mode 100644 index 00000000..601946ed --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/lib diff --git a/2.3-1/macros/ImageProcessing/imgproc/names b/2.3-1/macros/ImageProcessing/imgproc/names new file mode 100644 index 00000000..537af898 --- /dev/null +++ b/2.3-1/macros/ImageProcessing/imgproc/names @@ -0,0 +1 @@ +CV_CvtColor diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin Binary files differindex ab16036f..8e238866 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 5e4eb036..ac8d823c 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -5401,7 +5401,6 @@ ClassName = 'DIFF'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -5467,7 +5466,6 @@ ClassName = 'NORM'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -5509,7 +5507,6 @@ ClassName = 'CONVSTR'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -5544,7 +5541,6 @@ ClassName = 'CV_CreateImage'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''im''',ClassFileName,'file','y');
@@ -5569,7 +5565,6 @@ ClassName = 'CV_LoadImage'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''im''',ClassFileName,'file','y');
@@ -5594,7 +5589,6 @@ ClassName = 'CV_ShowImage'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
@@ -5631,7 +5625,6 @@ ClassName = 'CV_WaitKey'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
@@ -5647,6 +5640,54 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+//------------------------------------
+//---- Class CV_CvtColor -------------
+//------------------------------------
+ClassName = 'CV_CvtColor';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 3',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''u8''',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');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'CV_CvtColor';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+//------------------------------------
+//---- Class CV_GetImgSize -----------
+//------------------------------------
+ClassName = 'CV_GetImgSize';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
+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');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'CV_GetImgSize';
+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/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin Binary files differindex 2dad8e88..e934bc35 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.bin +++ b/2.3-1/macros/findDeps/getAllHeaders.bin diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index 846f8f6a..06963ca6 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -182,7 +182,8 @@ function allHeaders = getAllHeaders(SharedInfo) OpenCV_headers = [ "src/c/imageProcessing/includes/cvcore.h" - "src/c/imageProcessing/includes/cvhighgui.h"]; + "src/c/imageProcessing/includes/cvhighgui.h" + "src/c/imageProcessing/includes/cvimgproc.h"]; if Target == "StandAlone" allHeaders = Standalone_headers; diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin Binary files differindex ee40b128..c46573a8 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.bin +++ b/2.3-1/macros/findDeps/getAllInterfaces.bin diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci index 90975473..0f90d5cc 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.sci +++ b/2.3-1/macros/findDeps/getAllInterfaces.sci @@ -173,7 +173,8 @@ 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_cvhighgui.h" + "src/c/imageProcessing/interfaces/int_cvimgproc.h"]; if Target == "StandAlone" allInterfaces = Standalone_interfaces; diff --git a/2.3-1/macros/findDeps/getAllLibraries.bin b/2.3-1/macros/findDeps/getAllLibraries.bin Binary files differindex c6d006fa..f016eba2 100644 --- a/2.3-1/macros/findDeps/getAllLibraries.bin +++ b/2.3-1/macros/findDeps/getAllLibraries.bin diff --git a/2.3-1/macros/findDeps/getAllLibraries.sci b/2.3-1/macros/findDeps/getAllLibraries.sci index 7cd8f912..2850abad 100644 --- a/2.3-1/macros/findDeps/getAllLibraries.sci +++ b/2.3-1/macros/findDeps/getAllLibraries.sci @@ -10,8 +10,34 @@ function allLibraries = getAllLibraries(SharedInfo) "src/c/hardware/rasberrypi/libraries/libgsl.a" ]; + 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_ts.a" +]; + if Target == "RPi" - allLibraries = RPi_libs; + allLibraries = RPi_libs; + if (SharedInfo.OpenCVUsed == %T) + allLibraries = cat(1,allLibraries,RPi_cvlibs) + end + else allLibraries = []; end diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin Binary files differindex 974e9460..a6612baf 100644 --- a/2.3-1/macros/findDeps/getAllSources.bin +++ b/2.3-1/macros/findDeps/getAllSources.bin diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci index dafa5032..14326b6b 100644 --- a/2.3-1/macros/findDeps/getAllSources.sci +++ b/2.3-1/macros/findDeps/getAllSources.sci @@ -1040,8 +1040,10 @@ 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/cvhighgui/imcvShowImages.c" + "src/c/imageProcessing/cvimgproc/imcvCvtColors.c"]; if Target == "StandAlone" allSources = Standalone_files; diff --git a/2.3-1/macros/runsci2c.bin b/2.3-1/macros/runsci2c.bin Binary files differindex 62928248..253cc785 100644 --- a/2.3-1/macros/runsci2c.bin +++ b/2.3-1/macros/runsci2c.bin diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci index b0bb16b8..9301421f 100644 --- a/2.3-1/macros/runsci2c.sci +++ b/2.3-1/macros/runsci2c.sci @@ -147,10 +147,16 @@ if(~isempty(allLibraries)) PrintStepInfo('Copying libraries', FileInfo.GeneralReport,'both');
for i = 1:size(allLibraries, "*")
// DEBUG only
- //disp("Copying "+allInterfaces(i)+" in "+SCI2COutputPath+"/interfaces/");
+ //disp("Copying "+allLibraries(i)+" in "+SCI2COutputPath+"/libraries/");
copyfile(allLibraries(i), SCI2COutputPath+"/libraries/");
end
end
+
+//Copy folder containing opencv include files in Includes folder
+if((Target == 'RPi') & (SharedInfo.OpenCVUsed == %T))
+ copyfile(SCI2CHOME + "/" +'src/c/hardware/rasberrypi/libraries/opencv/opencv2/',SCI2COutputPath+"/includes/opencv2")
+end
+
// --------------------------
// --- Generate Makefile. ---
// --------------------------
@@ -185,6 +191,7 @@ else end
+
// ------------------------------
// --- Generate SCI2C Header. ---
// ------------------------------
|