Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/BowVector.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@

#include <map>
#include <vector>
#include <ostream>
#include <istream>
#include <string>
#include <cstdint>
#include "exports.h"
#if _WIN32
#include <cstdint>
Expand Down
1 change: 1 addition & 0 deletions src/FeatureVector.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#define __D_T_FEATURE_VECTOR__

#include "BowVector.h"
#include <ostream>
#include <map>
#include <vector>
#include "exports.h"
Expand Down
6 changes: 3 additions & 3 deletions src/Vocabulary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/Vocabulary.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion utils/create_voc_step0.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ vector<string> readImagePaths(int argc,char **argv,int start){
return paths;
}

vector< cv::Mat > loadFeatures( std::vector<string> path_to_images,string descriptor="") throw (std::exception){
vector< cv::Mat > loadFeatures( std::vector<string> path_to_images,string descriptor="") {
//select detector
cv::Ptr<cv::Feature2D> fdetector;
if (descriptor=="orb") fdetector=cv::ORB::create();
Expand Down
2 changes: 1 addition & 1 deletion utils/demo_general.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ vector<string> readImagePaths(int argc,char **argv,int start){
return paths;
}

vector< cv::Mat > loadFeatures( std::vector<string> path_to_images,string descriptor="") throw (std::exception){
vector< cv::Mat > loadFeatures( std::vector<string> path_to_images,string descriptor="") {
//select detector
cv::Ptr<cv::Feature2D> fdetector;
if (descriptor=="orb") fdetector=cv::ORB::create();
Expand Down