generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor changes in opencv_stitching

Browse Source
This commit is contained in:
Alexey Spizhevoy 2011-05-18 15:05:06 +00:00
parent 4567b4326b
commit d998c73769
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/stitching/main.cpp
View File

@ -47,7 +47,7 @@ int main(int argc, char* argv[])
int blend_type = Blender::MULTI_BAND; int blend_type = Blender::MULTI_BAND;
string result_name = "result.png"; string result_name = "result.png";
double work_scale, compose_scale; double work_scale = -1, compose_scale = -1;
bool is_work_scale_set = false, is_compose_scale_set = false; bool is_work_scale_set = false, is_compose_scale_set = false;
if (argc == 1) if (argc == 1)
@ -220,7 +220,7 @@ int main(int argc, char* argv[])
vector<MatchesInfo> pairwise_matches; vector<MatchesInfo> pairwise_matches;
BestOf2NearestMatcher matcher(trygpu); BestOf2NearestMatcher matcher(trygpu);
if (user_match_conf) if (user_match_conf)
matcher = BestOf2NearestMatcher(true, match_conf); matcher = BestOf2NearestMatcher(trygpu, match_conf);
matcher(images, features, pairwise_matches); matcher(images, features, pairwise_matches);
vector<int> indices = leaveBiggestComponent(images, features, pairwise_matches, conf_thresh); vector<int> indices = leaveBiggestComponent(images, features, pairwise_matches, conf_thresh);

2
modules/stitching/matchers.cpp
View File

@ -19,7 +19,7 @@ namespace
inline CpuSurfFeaturesFinder(double hess_thresh, int num_octaves, int num_layers, inline CpuSurfFeaturesFinder(double hess_thresh, int num_octaves, int num_layers,
int num_octaves_descr, int num_layers_descr) int num_octaves_descr, int num_layers_descr)
{ {
detector_ = new SurfFeatureDetector(hess_thresh, num_octaves, num_layers); detector_ = new /*FastFeatureDetector;*/SurfFeatureDetector(hess_thresh, num_octaves, num_layers);
extractor_ = new SurfDescriptorExtractor(num_octaves_descr, num_layers_descr); extractor_ = new SurfDescriptorExtractor(num_octaves_descr, num_layers_descr);
} }