Skip to content
Snippets Groups Projects
Commit 29ff87bc authored by Angel Santamaria-Navarro's avatar Angel Santamaria-Navarro
Browse files

Merge branch 'joan_fixes' into 'master'

Joan fixes

See merge request asantamaria/vision_utils!1
parents 0085b9dc 26dabc6e
No related branches found
No related tags found
1 merge request!1Joan fixes
Showing
with 48 additions and 65 deletions
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings"> <storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.1244102678"> <cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.772018425">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.1244102678" moduleId="org.eclipse.cdt.core.settings" name="Default"> <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.772018425" moduleId="org.eclipse.cdt.core.settings" name="Default">
<externalSettings/> <externalSettings/>
<extensions> <extensions>
<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/> <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
...@@ -14,45 +14,29 @@ ...@@ -14,45 +14,29 @@
</extensions> </extensions>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1244102678" name="Default" parent="org.eclipse.cdt.build.core.emptycfg"> <configuration buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.cross.base.772018425" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1244102678.1450977940" name="/" resourcePath=""> <folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.772018425.677700058" name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.base.1670099165" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base"> <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1577360791" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.1425058182" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/> <option id="cdt.managedbuild.option.gnu.cross.prefix.2047872140" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
<builder arguments="" buildPath="${workspace_loc:/vision_utils/build}" command="make" id="cdt.managedbuild.target.gnu.builder.base.1397358642" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="6" superClass="cdt.managedbuild.target.gnu.builder.base"/> <option id="cdt.managedbuild.option.gnu.cross.path.1906188929" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.599567389" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.530116614" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1572359948" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"> <builder buildPath="${workspace_loc:/vision_utils}/build" enabledIncrementalBuild="true" id="cdt.managedbuild.builder.gnu.cross.1321287044" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
<option id="gnu.cpp.compiler.option.include.paths.1770487778" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> <tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.2113617585" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
<listOptionValue builtIn="false" value="/usr/local/include"/> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.844027082" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Vision Utils/src}&quot;"/>
</option>
<option id="gnu.cpp.compiler.option.preprocessor.def.91385799" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__cplusplus=201103"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.466329004" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool> </tool>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1838202852" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base"> <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1552607345" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
<option id="gnu.c.compiler.option.include.paths.1944000269" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath"> <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2062058076" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/vision_utils/src}&quot;"/>
<listOptionValue builtIn="false" value="/usr/local/include"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.964584931" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool> </tool>
<tool id="cdt.managedbuild.tool.gnu.c.linker.base.1546364764" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/> <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1390296837" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.674742229" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base"> <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1526254170" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
<option id="gnu.cpp.link.option.paths.1264112011" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths"> <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1245904112" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<listOptionValue builtIn="false" value="/usr/local/lib"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.224259993" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/>
</inputType> </inputType>
</tool> </tool>
<tool id="cdt.managedbuild.tool.gnu.assembler.base.2121101980" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base"> <tool id="cdt.managedbuild.tool.gnu.cross.archiver.1731621126" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
<option id="gnu.both.asm.option.include.paths.738910739" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"> <tool id="cdt.managedbuild.tool.gnu.cross.assembler.1714654559" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/vision_utils/src}&quot;"/> <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1492925080" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
<listOptionValue builtIn="false" value="/usr/local/include"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1979788870" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool> </tool>
</toolChain> </toolChain>
</folderInfo> </folderInfo>
...@@ -61,16 +45,6 @@ ...@@ -61,16 +45,6 @@
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration> </cconfiguration>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="vision_utils.null.866851028" name="vision_utils"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/vision_utils"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
<storageModule moduleId="scannerConfiguration"> <storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1819918851;cdt.managedbuild.toolchain.gnu.base.1819918851.1318867162;cdt.managedbuild.tool.gnu.cpp.compiler.base.1649772065;cdt.managedbuild.tool.gnu.cpp.compiler.input.146329834"> <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1819918851;cdt.managedbuild.toolchain.gnu.base.1819918851.1318867162;cdt.managedbuild.tool.gnu.cpp.compiler.base.1649772065;cdt.managedbuild.tool.gnu.cpp.compiler.input.146329834">
...@@ -104,4 +78,14 @@ ...@@ -104,4 +78,14 @@
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo> </scannerConfigBuildInfo>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="vision_utils.null.1064155195" name="vision_utils"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/vision_utils"/>
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
</cproject> </cproject>
...@@ -4,4 +4,3 @@ perf.data ...@@ -4,4 +4,3 @@ perf.data
**/*.*~ **/*.*~
.settings/ .settings/
.cproject .cproject
*.cproject
...@@ -14,7 +14,7 @@ namespace vision_utils { ...@@ -14,7 +14,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(AlgorithmACTIVESEARCH); VU_PTR_TYPEDEFS(AlgorithmACTIVESEARCH);
VU_PTR_TYPEDEFS(AlgorithmParamsACTIVESEARCH); VU_STRUCT_PTR_TYPEDEFS(AlgorithmParamsACTIVESEARCH);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -13,7 +13,7 @@ namespace vision_utils ...@@ -13,7 +13,7 @@ namespace vision_utils
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(AlgorithmBase); VU_PTR_TYPEDEFS(AlgorithmBase);
VU_PTR_TYPEDEFS(AlgorithmParamsBase); VU_STRUCT_PTR_TYPEDEFS(AlgorithmParamsBase);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -14,7 +14,7 @@ namespace vision_utils { ...@@ -14,7 +14,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(AlgorithmOPTFLOWPYRLK); VU_PTR_TYPEDEFS(AlgorithmOPTFLOWPYRLK);
VU_PTR_TYPEDEFS(AlgorithmParamsOPTFLOWPYRLK); VU_STRUCT_PTR_TYPEDEFS(AlgorithmParamsOPTFLOWPYRLK);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -10,7 +10,7 @@ namespace vision_utils { ...@@ -10,7 +10,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(AlgorithmRESIDUALTRILINEARITY); VU_PTR_TYPEDEFS(AlgorithmRESIDUALTRILINEARITY);
VU_PTR_TYPEDEFS(AlgorithmParamsRESIDUALTRILINEARITY); VU_STRUCT_PTR_TYPEDEFS(AlgorithmParamsRESIDUALTRILINEARITY);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -14,7 +14,7 @@ namespace vision_utils { ...@@ -14,7 +14,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(AlgorithmTRACKFEATURES); VU_PTR_TYPEDEFS(AlgorithmTRACKFEATURES);
VU_PTR_TYPEDEFS(AlgorithmParamsTRACKFEATURES); VU_STRUCT_PTR_TYPEDEFS(AlgorithmParamsTRACKFEATURES);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorAKAZE); VU_PTR_TYPEDEFS(DescriptorAKAZE);
VU_PTR_TYPEDEFS(DescriptorParamsAKAZE); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsAKAZE);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorBRIEF); VU_PTR_TYPEDEFS(DescriptorBRIEF);
VU_PTR_TYPEDEFS(DescriptorParamsBRIEF); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsBRIEF);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorBRISK); VU_PTR_TYPEDEFS(DescriptorBRISK);
VU_PTR_TYPEDEFS(DescriptorParamsBRISK); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsBRISK);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorDAISY); VU_PTR_TYPEDEFS(DescriptorDAISY);
VU_PTR_TYPEDEFS(DescriptorParamsDAISY); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsDAISY);
/** \DAISY Class parameters /** \DAISY Class parameters
* *
......
...@@ -15,7 +15,7 @@ namespace vision_utils ...@@ -15,7 +15,7 @@ namespace vision_utils
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorBase); VU_PTR_TYPEDEFS(DescriptorBase);
VU_PTR_TYPEDEFS(DescriptorParamsBase); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsBase);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorFREAK); VU_PTR_TYPEDEFS(DescriptorFREAK);
VU_PTR_TYPEDEFS(DescriptorParamsFREAK); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsFREAK);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorKAZE); VU_PTR_TYPEDEFS(DescriptorKAZE);
VU_PTR_TYPEDEFS(DescriptorParamsKAZE); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsKAZE);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorLATCH); VU_PTR_TYPEDEFS(DescriptorLATCH);
VU_PTR_TYPEDEFS(DescriptorParamsLATCH); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsLATCH);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorLUCID); VU_PTR_TYPEDEFS(DescriptorLUCID);
VU_PTR_TYPEDEFS(DescriptorParamsLUCID); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsLUCID);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorORB); VU_PTR_TYPEDEFS(DescriptorORB);
VU_PTR_TYPEDEFS(DescriptorParamsORB); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsORB);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorSIFT); VU_PTR_TYPEDEFS(DescriptorSIFT);
VU_PTR_TYPEDEFS(DescriptorParamsSIFT); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsSIFT);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ namespace vision_utils { ...@@ -8,7 +8,7 @@ namespace vision_utils {
// Create all pointers // Create all pointers
VU_PTR_TYPEDEFS(DescriptorSURF); VU_PTR_TYPEDEFS(DescriptorSURF);
VU_PTR_TYPEDEFS(DescriptorParamsSURF); VU_STRUCT_PTR_TYPEDEFS(DescriptorParamsSURF);
/** \brief Class parameters /** \brief Class parameters
* *
......
...@@ -8,7 +8,7 @@ DetectorAGAST::DetectorAGAST(void) ...@@ -8,7 +8,7 @@ DetectorAGAST::DetectorAGAST(void)
DetectorAGAST::~DetectorAGAST(void) DetectorAGAST::~DetectorAGAST(void)
{} {}
KeyPointVector DetectorAGAST::detect(const cv::Mat& _image, const cv::InputArray& _mask) KeyPointVector DetectorAGAST::detect(const cv::Mat& _image, cv::InputArray& _mask)
{ {
KeyPointVector kpts; KeyPointVector kpts;
clock_t tStart = clock(); clock_t tStart = clock();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment