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 29 additions and 28 deletions
...@@ -15,9 +15,10 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib) ...@@ -15,9 +15,10 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
SET(CMAKE_INSTALL_PREFIX /usr/local) SET(CMAKE_INSTALL_PREFIX /usr/local)
IF (NOT CMAKE_BUILD_TYPE) IF (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "DEBUG") SET(CMAKE_BUILD_TYPE "RELEASE")
ENDIF (NOT CMAKE_BUILD_TYPE) ENDIF (NOT CMAKE_BUILD_TYPE)
MESSAGE(STATUS "Compilation type: ${CMAKE_BUILD_TYPE}")
if(UNIX) if(UNIX)
# GCC is not strict enough by default, so enable most of the warnings. # GCC is not strict enough by default, so enable most of the warnings.
set(CMAKE_CXX_FLAGS set(CMAKE_CXX_FLAGS
......
...@@ -43,7 +43,7 @@ static ParamsBasePtr createParamsACTIVESEARCHAlgorithm(const std::string & _file ...@@ -43,7 +43,7 @@ static ParamsBasePtr createParamsACTIVESEARCHAlgorithm(const std::string & _file
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_matACTIVESEARCH_params = ParamsFactory::get().registerCreator("ACTIVESEARCH ALG", createParamsACTIVESEARCHAlgorithm); const bool VU_UNUSED registered_matACTIVESEARCH_params = ParamsFactory::get().registerCreator("ACTIVESEARCH ALG", createParamsACTIVESEARCHAlgorithm);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -24,7 +24,7 @@ inline std::string AlgorithmFactory::getClass() ...@@ -24,7 +24,7 @@ inline std::string AlgorithmFactory::getClass()
} }
#define VU_REGISTER_ALGORITHM(AlgorithmType, AlgorithmName) \ #define VU_REGISTER_ALGORITHM(AlgorithmType, AlgorithmName) \
namespace{ const bool AlgorithmName##Registered = \ namespace{ const bool VU_UNUSED AlgorithmName##Registered = \
AlgorithmFactory::get().registerCreator(AlgorithmType, AlgorithmName::create, true); }\ AlgorithmFactory::get().registerCreator(AlgorithmType, AlgorithmName::create, true); }\
} /* namespace vision_utils */ } /* namespace vision_utils */
......
...@@ -45,7 +45,7 @@ static ParamsBasePtr createParamsOPTFLOWPYRLKAlgorithm(const std::string & _file ...@@ -45,7 +45,7 @@ static ParamsBasePtr createParamsOPTFLOWPYRLKAlgorithm(const std::string & _file
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_matOPTFLOWPYRLK_params = ParamsFactory::get().registerCreator("OPTFLOWPYRLK ALG", createParamsOPTFLOWPYRLKAlgorithm); const bool VU_UNUSED registered_matOPTFLOWPYRLK_params = ParamsFactory::get().registerCreator("OPTFLOWPYRLK ALG", createParamsOPTFLOWPYRLKAlgorithm);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsTRACKFEATURESAlgorithm(const std::string & _fil ...@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsTRACKFEATURESAlgorithm(const std::string & _fil
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_matTRACKFEATURES_params = ParamsFactory::get().registerCreator("TRACKFEATURES ALG", createParamsTRACKFEATURESAlgorithm); const bool VU_UNUSED registered_matTRACKFEATURES_params = ParamsFactory::get().registerCreator("TRACKFEATURES ALG", createParamsTRACKFEATURESAlgorithm);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -51,7 +51,7 @@ public: ...@@ -51,7 +51,7 @@ public:
/** /**
* \brief Return the image * \brief Return the image
*/ */
cv::Mat getImage(void); const cv::Mat& getImage(void) const;
/** /**
* \brief Set the image * \brief Set the image
...@@ -61,7 +61,7 @@ public: ...@@ -61,7 +61,7 @@ public:
/** /**
* \brief Return the frame Keypoints * \brief Return the frame Keypoints
*/ */
KeyPointVector getKeyPoints(void); KeyPointVector& getKeyPoints(void);
/** /**
* \brief Set the frame Keypoints * \brief Set the frame Keypoints
...@@ -82,7 +82,7 @@ public: ...@@ -82,7 +82,7 @@ public:
/** /**
* \brief Return the frame descriptors * \brief Return the frame descriptors
*/ */
cv::Mat getDescriptors(void); cv::Mat& getDescriptors(void);
/** /**
* \brief Set the frame descriptors * \brief Set the frame descriptors
...@@ -111,7 +111,7 @@ inline void Frame::setId(const int& _id) ...@@ -111,7 +111,7 @@ inline void Frame::setId(const int& _id)
id_ = _id; id_ = _id;
} }
inline cv::Mat Frame::getImage(void) inline const cv::Mat& Frame::getImage(void) const
{ {
return img_; return img_;
} }
...@@ -121,7 +121,7 @@ inline void Frame::setImage(const cv::Mat& _img) ...@@ -121,7 +121,7 @@ inline void Frame::setImage(const cv::Mat& _img)
img_ = _img; img_ = _img;
} }
inline KeyPointVector Frame::getKeyPoints(void) inline KeyPointVector& Frame::getKeyPoints(void)
{ {
return kps_; return kps_;
}; };
...@@ -141,7 +141,7 @@ inline void Frame::addKeyPoints(const KeyPointVector& _kps) ...@@ -141,7 +141,7 @@ inline void Frame::addKeyPoints(const KeyPointVector& _kps)
kps_.insert(kps_.end(), _kps.begin(), _kps.end() ); kps_.insert(kps_.end(), _kps.begin(), _kps.end() );
} }
inline PointVector Frame::getPoints(void) inline PointVector Frame::getPoints(void)
{ {
PointVector pvec; PointVector pvec;
for (auto kp : kps_) for (auto kp : kps_)
...@@ -149,12 +149,12 @@ inline PointVector Frame::getPoints(void) ...@@ -149,12 +149,12 @@ inline PointVector Frame::getPoints(void)
return pvec; return pvec;
}; };
inline cv::Mat Frame::getDescriptors(void) inline cv::Mat& Frame::getDescriptors(void)
{ {
return desc_; return desc_;
}; };
inline void Frame::setDescriptors(const cv::Mat& _desc) inline void Frame::setDescriptors(const cv::Mat& _desc)
{ {
assert( kps_.size() == _desc.rows && "The Number of descriptors must be equal to number of keypoints"); assert( kps_.size() == _desc.rows && "The Number of descriptors must be equal to number of keypoints");
desc_ = _desc; desc_ = _desc;
......
...@@ -41,7 +41,7 @@ static ParamsBasePtr createParamsAKAZEDescriptor(const std::string & _filename_d ...@@ -41,7 +41,7 @@ static ParamsBasePtr createParamsAKAZEDescriptor(const std::string & _filename_d
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desAKAZE_params = ParamsFactory::get().registerCreator("AKAZE DES", createParamsAKAZEDescriptor); const bool VU_UNUSED registered_desAKAZE_params = ParamsFactory::get().registerCreator("AKAZE DES", createParamsAKAZEDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -36,7 +36,7 @@ static ParamsBasePtr createParamsBRIEFDescriptor(const std::string & _filename_d ...@@ -36,7 +36,7 @@ static ParamsBasePtr createParamsBRIEFDescriptor(const std::string & _filename_d
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desBRIEF_params = ParamsFactory::get().registerCreator("BRIEF DES", createParamsBRIEFDescriptor); const bool VU_UNUSED registered_desBRIEF_params = ParamsFactory::get().registerCreator("BRIEF DES", createParamsBRIEFDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -37,7 +37,7 @@ static ParamsBasePtr createParamsBRISKDescriptor(const std::string & _filename_d ...@@ -37,7 +37,7 @@ static ParamsBasePtr createParamsBRISKDescriptor(const std::string & _filename_d
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desBRISK_params = ParamsFactory::get().registerCreator("BRISK DES", createParamsBRISKDescriptor); const bool VU_UNUSED registered_desBRISK_params = ParamsFactory::get().registerCreator("BRISK DES", createParamsBRISKDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -43,7 +43,7 @@ static ParamsBasePtr createParamsDAISYDescriptor(const std::string & _filename_d ...@@ -43,7 +43,7 @@ static ParamsBasePtr createParamsDAISYDescriptor(const std::string & _filename_d
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desDAISY_params = ParamsFactory::get().registerCreator("DAISY DES", createParamsDAISYDescriptor); const bool VU_UNUSED registered_desDAISY_params = ParamsFactory::get().registerCreator("DAISY DES", createParamsDAISYDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -24,7 +24,7 @@ inline std::string DescriptorFactory::getClass() ...@@ -24,7 +24,7 @@ inline std::string DescriptorFactory::getClass()
} }
#define VU_REGISTER_DESCRIPTOR(DescriptorType, DescriptorName) \ #define VU_REGISTER_DESCRIPTOR(DescriptorType, DescriptorName) \
namespace{ const bool DescriptorName##Registered = \ namespace{ const bool VU_UNUSED DescriptorName##Registered = \
DescriptorFactory::get().registerCreator(DescriptorType, DescriptorName::create, true); }\ DescriptorFactory::get().registerCreator(DescriptorType, DescriptorName::create, true); }\
} /* namespace vision_utils */ } /* namespace vision_utils */
......
...@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsFREAKDescriptor(const std::string & _filename_d ...@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsFREAKDescriptor(const std::string & _filename_d
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desFREAK_params = ParamsFactory::get().registerCreator("FREAK DES", createParamsFREAKDescriptor); const bool VU_UNUSED registered_desFREAK_params = ParamsFactory::get().registerCreator("FREAK DES", createParamsFREAKDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -40,7 +40,7 @@ static ParamsBasePtr createParamsKAZEDescriptor(const std::string & _filename_do ...@@ -40,7 +40,7 @@ static ParamsBasePtr createParamsKAZEDescriptor(const std::string & _filename_do
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desKAZE_params = ParamsFactory::get().registerCreator("KAZE DES", createParamsKAZEDescriptor); const bool VU_UNUSED registered_desKAZE_params = ParamsFactory::get().registerCreator("KAZE DES", createParamsKAZEDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -38,7 +38,7 @@ static ParamsBasePtr createParamsLATCHDescriptor(const std::string & _filename_d ...@@ -38,7 +38,7 @@ static ParamsBasePtr createParamsLATCHDescriptor(const std::string & _filename_d
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desLATCH_params = ParamsFactory::get().registerCreator("LATCH DES", createParamsLATCHDescriptor); const bool VU_UNUSED registered_desLATCH_params = ParamsFactory::get().registerCreator("LATCH DES", createParamsLATCHDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -36,7 +36,7 @@ static ParamsBasePtr createParamsLUCIDDescriptor(const std::string & _filename_d ...@@ -36,7 +36,7 @@ static ParamsBasePtr createParamsLUCIDDescriptor(const std::string & _filename_d
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desLUCID_params = ParamsFactory::get().registerCreator("LUCID DES", createParamsLUCIDDescriptor); const bool VU_UNUSED registered_desLUCID_params = ParamsFactory::get().registerCreator("LUCID DES", createParamsLUCIDDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -42,7 +42,7 @@ static ParamsBasePtr createParamsORBDescriptor(const std::string & _filename_dot ...@@ -42,7 +42,7 @@ static ParamsBasePtr createParamsORBDescriptor(const std::string & _filename_dot
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desORB_params = ParamsFactory::get().registerCreator("ORB DES", createParamsORBDescriptor); const bool VU_UNUSED registered_desORB_params = ParamsFactory::get().registerCreator("ORB DES", createParamsORBDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsSIFTDescriptor(const std::string & _filename_do ...@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsSIFTDescriptor(const std::string & _filename_do
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desSIFT_params = ParamsFactory::get().registerCreator("SIFT DES", createParamsSIFTDescriptor); const bool VU_UNUSED registered_desSIFT_params = ParamsFactory::get().registerCreator("SIFT DES", createParamsSIFTDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsSURFDescriptor(const std::string & _filename_do ...@@ -39,7 +39,7 @@ static ParamsBasePtr createParamsSURFDescriptor(const std::string & _filename_do
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_desSURF_params = ParamsFactory::get().registerCreator("SURF DES", createParamsSURFDescriptor); const bool VU_UNUSED registered_desSURF_params = ParamsFactory::get().registerCreator("SURF DES", createParamsSURFDescriptor);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -37,7 +37,7 @@ static ParamsBasePtr createParamsAGASTDetector(const std::string & _filename_dot ...@@ -37,7 +37,7 @@ static ParamsBasePtr createParamsAGASTDetector(const std::string & _filename_dot
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_detAGAST_params = ParamsFactory::get().registerCreator("AGAST DET", createParamsAGASTDetector); const bool VU_UNUSED registered_detAGAST_params = ParamsFactory::get().registerCreator("AGAST DET", createParamsAGASTDetector);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
...@@ -41,7 +41,7 @@ static ParamsBasePtr createParamsAKAZEDetector(const std::string & _filename_dot ...@@ -41,7 +41,7 @@ static ParamsBasePtr createParamsAKAZEDetector(const std::string & _filename_dot
} }
// Register in the SensorFactory // Register in the SensorFactory
const bool registered_detAKAZE_params = ParamsFactory::get().registerCreator("AKAZE DET", createParamsAKAZEDetector); const bool VU_UNUSED registered_detAKAZE_params = ParamsFactory::get().registerCreator("AKAZE DET", createParamsAKAZEDetector);
} /* namespace [unnamed] */ } /* namespace [unnamed] */
......
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