From d998c73769696d3bc574bf3d2002c034a66f9946 Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Wed, 18 May 2011 15:05:06 +0000 Subject: [PATCH] minor changes in opencv_stitching --- modules/stitching/main.cpp | 4 ++-- modules/stitching/matchers.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/stitching/main.cpp b/modules/stitching/main.cpp index bbdf701538..569a102033 100644 --- a/modules/stitching/main.cpp +++ b/modules/stitching/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char* argv[]) int blend_type = Blender::MULTI_BAND; 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; if (argc == 1) @@ -220,7 +220,7 @@ int main(int argc, char* argv[]) vector pairwise_matches; BestOf2NearestMatcher matcher(trygpu); if (user_match_conf) - matcher = BestOf2NearestMatcher(true, match_conf); + matcher = BestOf2NearestMatcher(trygpu, match_conf); matcher(images, features, pairwise_matches); vector indices = leaveBiggestComponent(images, features, pairwise_matches, conf_thresh); diff --git a/modules/stitching/matchers.cpp b/modules/stitching/matchers.cpp index 0aaa163898..df5444bb33 100644 --- a/modules/stitching/matchers.cpp +++ b/modules/stitching/matchers.cpp @@ -19,7 +19,7 @@ namespace inline CpuSurfFeaturesFinder(double hess_thresh, int num_octaves, int num_layers, 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); }