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

FIX to work with RELEASE compilation

parent ca33cbfe
No related branches found
No related tags found
No related merge requests found
Showing
with 38 additions and 22 deletions
......@@ -37,7 +37,7 @@ static ParamsBasePtr createParamsBRISKDetector(const std::string & _filename_dot
}
// Register in the SensorFactory
const bool registered_detBRISK_params = ParamsFactory::get().registerCreator("BRISK DET", createParamsBRISKDetector);
const bool VU_UNUSED registered_detBRISK_params = ParamsFactory::get().registerCreator("BRISK DET", createParamsBRISKDetector);
} /* namespace [unnamed] */
......
......@@ -24,7 +24,7 @@ inline std::string DetectorFactory::getClass()
}
#define VU_REGISTER_DETECTOR(DetectorType, DetectorName) \
namespace{ const bool DetectorName##Registered = \
namespace{ const bool VU_UNUSED DetectorName##Registered = \
DetectorFactory::get().registerCreator(DetectorType, DetectorName::create, true); }\
} /* namespace vision_utils */
......
......@@ -37,7 +37,7 @@ static ParamsBasePtr createParamsFASTDetector(const std::string & _filename_dot_
}
// Register in the SensorFactory
const bool registered_detfast_params = ParamsFactory::get().registerCreator("FAST DET", createParamsFASTDetector);
const bool VU_UNUSED registered_detfast_params = ParamsFactory::get().registerCreator("FAST DET", createParamsFASTDetector);
} /* namespace [unnamed] */
......
......@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsGFTTDetector(const std::string & _filename_dot_
}
// Register in the SensorFactory
const bool registered_detGFTT_params = ParamsFactory::get().registerCreator("GFTT DET", createParamsGFTTDetector);
const bool VU_UNUSED registered_detGFTT_params = ParamsFactory::get().registerCreator("GFTT DET", createParamsGFTTDetector);
} /* namespace [unnamed] */
......
......@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsHARRISDetector(const std::string & _filename_do
}
// Register in the SensorFactory
const bool registered_detHARRIS_params = ParamsFactory::get().registerCreator("HARRIS DET", createParamsHARRISDetector);
const bool VU_UNUSED registered_detHARRIS_params = ParamsFactory::get().registerCreator("HARRIS DET", createParamsHARRISDetector);
} /* namespace [unnamed] */
......
......@@ -40,7 +40,7 @@ static ParamsBasePtr createParamsKAZEDetector(const std::string & _filename_dot_
}
// Register in the SensorFactory
const bool registered_detKAZE_params = ParamsFactory::get().registerCreator("KAZE DET", createParamsKAZEDetector);
const bool VU_UNUSED registered_detKAZE_params = ParamsFactory::get().registerCreator("KAZE DET", createParamsKAZEDetector);
} /* namespace [unnamed] */
......
......@@ -43,7 +43,7 @@ static ParamsBasePtr createParamsMSERDetector(const std::string & _filename_dot_
}
// Register in the SensorFactory
const bool registered_detMSER_params = ParamsFactory::get().registerCreator("MSER DET", createParamsMSERDetector);
const bool VU_UNUSED registered_detMSER_params = ParamsFactory::get().registerCreator("MSER DET", createParamsMSERDetector);
} /* namespace [unnamed] */
......
......@@ -42,7 +42,7 @@ static ParamsBasePtr createParamsORBDetector(const std::string & _filename_dot_y
}
// Register in the SensorFactory
const bool registered_detORB_params = ParamsFactory::get().registerCreator("ORB DET", createParamsORBDetector);
const bool VU_UNUSED registered_detORB_params = ParamsFactory::get().registerCreator("ORB DET", createParamsORBDetector);
} /* namespace [unnamed] */
......
......@@ -57,7 +57,7 @@ static ParamsBasePtr createParamsSBDDetector(const std::string & _filename_dot_y
}
// Register in the SensorFactory
const bool registered_detSBD_params = ParamsFactory::get().registerCreator("SBD DET", createParamsSBDDetector);
const bool VU_UNUSED registered_detSBD_params = ParamsFactory::get().registerCreator("SBD DET", createParamsSBDDetector);
} /* namespace [unnamed] */
......
......@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsSIFTDetector(const std::string & _filename_dot_
}
// Register in the SensorFactory
const bool registered_detSIFT_params = ParamsFactory::get().registerCreator("SIFT DET", createParamsSIFTDetector);
const bool VU_UNUSED registered_detSIFT_params = ParamsFactory::get().registerCreator("SIFT DET", createParamsSIFTDetector);
} /* namespace [unnamed] */
......
......@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsSURFDetector(const std::string & _filename_dot_
}
// Register in the SensorFactory
const bool registered_detSURF_params = ParamsFactory::get().registerCreator("SURF DET", createParamsSURFDetector);
const bool VU_UNUSED registered_detSURF_params = ParamsFactory::get().registerCreator("SURF DET", createParamsSURFDetector);
} /* namespace [unnamed] */
......
......@@ -3,7 +3,7 @@ sensor:
detector:
type: "ORB"
nfeatures: 100
nfeatures: 200
scale factor: 1.2
nlevels: 8
edge threshold: 8 # 16
......@@ -16,11 +16,11 @@ detector:
algorithm:
type: "OPTFLOWPYRLK"
draw results: true
min features to track: 5
window edge: 21
min features to track: 10
window edge: 30
max level: 10
criteria max count: 30
criteria epsilon: 0.01
flags: 0
min eigen threshold: 1e-4
min error kpt match: 4.0
min error kpt match: 10.0
......@@ -110,6 +110,22 @@ inline std::string ParamsFactory::getClass()
return "Params Factory";
}
//#define UNUSED(x) (void)x;
//#define UNUSED(x) (void)(sizeof((x), 0));
#ifdef __GNUC__
#define VU_UNUSED __attribute__((used))
#elif defined _MSC_VER
#pragma warning(disable: Cxxxxx)
#define VU_UNUSED
#elif defined(__LCLINT__)
# define VU_UNUSED /*@unused@*/
#elif defined(__cplusplus)
# define VU_UNUSED
#else
# define UNUSED(x) x
#endif
} /* namespace vision_utils */
#endif
......@@ -36,7 +36,7 @@ static ParamsBasePtr createParamsBRUTEFORCEMatcher(const std::string & _filename
}
// Register in the SensorFactory
const bool registered_matBRUTEFORCE_params = ParamsFactory::get().registerCreator("BRUTEFORCE MAT", createParamsBRUTEFORCEMatcher);
const bool VU_UNUSED registered_matBRUTEFORCE_params = ParamsFactory::get().registerCreator("BRUTEFORCE MAT", createParamsBRUTEFORCEMatcher);
} /* namespace [unnamed] */
......
......@@ -36,7 +36,7 @@ static ParamsBasePtr createParamsBRUTEFORCE_HAMMINGMatcher(const std::string & _
}
// Register in the SensorFactory
const bool registered_matBRUTEFORCE_HAMMING_params = ParamsFactory::get().registerCreator("BRUTEFORCE_HAMMING MAT", createParamsBRUTEFORCE_HAMMINGMatcher);
const bool VU_UNUSED registered_matBRUTEFORCE_HAMMING_params = ParamsFactory::get().registerCreator("BRUTEFORCE_HAMMING MAT", createParamsBRUTEFORCE_HAMMINGMatcher);
} /* namespace [unnamed] */
......
......@@ -36,7 +36,7 @@ static ParamsBasePtr createParamsBRUTEFORCE_HAMMING_2Matcher(const std::string &
}
// Register in the SensorFactory
const bool registered_matBRUTEFORCE_HAMMING_2_params = ParamsFactory::get().registerCreator("BRUTEFORCE_HAMMING_2 MAT", createParamsBRUTEFORCE_HAMMING_2Matcher);
const bool VU_UNUSED registered_matBRUTEFORCE_HAMMING_2_params = ParamsFactory::get().registerCreator("BRUTEFORCE_HAMMING_2 MAT", createParamsBRUTEFORCE_HAMMING_2Matcher);
} /* namespace [unnamed] */
......
......@@ -36,7 +36,7 @@ static ParamsBasePtr createParamsBRUTEFORCE_L1Matcher(const std::string & _filen
}
// Register in the SensorFactory
const bool registered_matBRUTEFORCE_L1_params = ParamsFactory::get().registerCreator("BRUTEFORCE_L1 MAT", createParamsBRUTEFORCE_L1Matcher);
const bool VU_UNUSED registered_matBRUTEFORCE_L1_params = ParamsFactory::get().registerCreator("BRUTEFORCE_L1 MAT", createParamsBRUTEFORCE_L1Matcher);
} /* namespace [unnamed] */
......
......@@ -36,7 +36,7 @@ static ParamsBasePtr createParamsFLANNBASEDMatcher(const std::string & _filename
}
// Register in the SensorFactory
const bool registered_matFLANNBASED_params = ParamsFactory::get().registerCreator("FLANNBASED MAT", createParamsFLANNBASEDMatcher);
const bool VU_UNUSED registered_matFLANNBASED_params = ParamsFactory::get().registerCreator("FLANNBASED MAT", createParamsFLANNBASEDMatcher);
} /* namespace [unnamed] */
......
......@@ -24,7 +24,7 @@ inline std::string MatcherFactory::getClass()
}
#define VU_REGISTER_MATCHER(MatcherType, MatcherName) \
namespace{ const bool MatcherName##Registered = \
namespace{ const bool VU_UNUSED MatcherName##Registered = \
MatcherFactory::get().registerCreator(MatcherType, MatcherName::create, true); }\
} /* namespace vision_utils */
......
......@@ -24,7 +24,7 @@ inline std::string SensorFactory::getClass()
}
#define VU_REGISTER_SENSOR(SensorType, SensorName) \
namespace{ const bool SensorName##Registered = \
namespace{ const bool VU_UNUSED SensorName##Registered = \
SensorFactory::get().registerCreator(SensorType, SensorName::create, true); }\
} /* namespace vision_utils */
......
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