diff --git a/src/BowVector.h b/src/BowVector.h index d8c17e0..2170b5e 100644 --- a/src/BowVector.h +++ b/src/BowVector.h @@ -12,6 +12,10 @@ #include #include +#include +#include +#include +#include #include "exports.h" #if _WIN32 #include diff --git a/src/FeatureVector.h b/src/FeatureVector.h index f06bc1e..99d702b 100644 --- a/src/FeatureVector.h +++ b/src/FeatureVector.h @@ -11,6 +11,7 @@ #define __D_T_FEATURE_VECTOR__ #include "BowVector.h" +#include #include #include #include "exports.h" diff --git a/src/Vocabulary.cpp b/src/Vocabulary.cpp index 9f0eff3..accbd68 100644 --- a/src/Vocabulary.cpp +++ b/src/Vocabulary.cpp @@ -1177,7 +1177,7 @@ void Vocabulary::save(cv::FileStorage &f, } -void Vocabulary::toStream( std::ostream &out_str, bool compressed) const throw(std::exception){ +void Vocabulary::toStream( std::ostream &out_str, bool compressed) const { uint64_t sig=88877711233;//magic number describing the file out_str.write((char*)&sig,sizeof(sig)); @@ -1257,7 +1257,7 @@ void Vocabulary::toStream( std::ostream &out_str, bool compressed) const throw( } -void Vocabulary:: load_fromtxt(const std::string &filename)throw(std::runtime_error){ +void Vocabulary:: load_fromtxt(const std::string &filename){ std::ifstream ifile(filename); if(!ifile)throw std::runtime_error("Vocabulary:: load_fromtxt Could not open file for reading:"+filename); @@ -1332,7 +1332,7 @@ void Vocabulary:: load_fromtxt(const std::string &filename)throw(std::runtime_er } } } -void Vocabulary::fromStream( std::istream &str ) throw(std::exception){ +void Vocabulary::fromStream( std::istream &str ){ m_words.clear(); diff --git a/src/Vocabulary.h b/src/Vocabulary.h index 7cf5f5a..c5113b6 100644 --- a/src/Vocabulary.h +++ b/src/Vocabulary.h @@ -299,8 +299,8 @@ friend class FastSearch; */ int getDescritorType()const; //io to-from a stream - void toStream( std::ostream &str, bool compressed=true) const throw(std::exception); - void fromStream( std::istream &str ) throw(std::exception); + void toStream( std::ostream &str, bool compressed=true) const; + void fromStream( std::istream &str ); protected: @@ -435,7 +435,7 @@ friend class FastSearch; /**Loads from ORBSLAM txt files */ - void load_fromtxt(const std::string &filename)throw(std::runtime_error); + void load_fromtxt(const std::string &filename); protected: diff --git a/utils/create_voc_step0.cpp b/utils/create_voc_step0.cpp index 4fd78f6..239a7ea 100644 --- a/utils/create_voc_step0.cpp +++ b/utils/create_voc_step0.cpp @@ -43,7 +43,7 @@ vector readImagePaths(int argc,char **argv,int start){ return paths; } -vector< cv::Mat > loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ +vector< cv::Mat > loadFeatures( std::vector path_to_images,string descriptor="") { //select detector cv::Ptr fdetector; if (descriptor=="orb") fdetector=cv::ORB::create(); diff --git a/utils/demo_general.cpp b/utils/demo_general.cpp index 63db40b..7cdf129 100644 --- a/utils/demo_general.cpp +++ b/utils/demo_general.cpp @@ -48,7 +48,7 @@ vector readImagePaths(int argc,char **argv,int start){ return paths; } -vector< cv::Mat > loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ +vector< cv::Mat > loadFeatures( std::vector path_to_images,string descriptor="") { //select detector cv::Ptr fdetector; if (descriptor=="orb") fdetector=cv::ORB::create();