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

Fixed bug #1693. Also corrected default parameters for stitching.

Browse Source
This commit is contained in:
Alexey Spizhevoy 2012-03-19 11:51:18 +00:00
parent e50c0ed4c8
commit e87a07e2aa
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
View File

@ -169,7 +169,7 @@ protected:
class CV_EXPORTS BestOf2NearestMatcher : public FeaturesMatcher class CV_EXPORTS BestOf2NearestMatcher : public FeaturesMatcher
{ {
public: public:
BestOf2NearestMatcher(bool try_use_gpu = false, float match_conf = 0.65f, int num_matches_thresh1 = 6, BestOf2NearestMatcher(bool try_use_gpu = false, float match_conf = 0.3f, int num_matches_thresh1 = 6,
int num_matches_thresh2 = 6); int num_matches_thresh2 = 6);
void collectGarbage(); void collectGarbage();

4
modules/stitching/src/matchers.cpp
View File

@ -351,9 +351,9 @@ void SurfFeaturesFinder::find(const Mat &image, ImageFeatures &features)
} }
else else
{ {
vector<float> descriptors; Mat descriptors;
(*surf)(gray_image, Mat(), features.keypoints, descriptors); (*surf)(gray_image, Mat(), features.keypoints, descriptors);
features.descriptors = Mat(descriptors, true).reshape(1, (int)features.keypoints.size()); features.descriptors = descriptors.reshape(1, (int)features.keypoints.size());
} }
} }

2
samples/cpp/stitching_detailed.cpp
View File

@ -135,7 +135,7 @@ bool save_graph = false;
std::string save_graph_to; std::string save_graph_to;
string warp_type = "spherical"; string warp_type = "spherical";
int expos_comp_type = ExposureCompensator::GAIN_BLOCKS; int expos_comp_type = ExposureCompensator::GAIN_BLOCKS;
float match_conf = 0.65f; float match_conf = 0.3f;
string seam_find_type = "gc_color"; string seam_find_type = "gc_color";
int blend_type = Blender::MULTI_BAND; int blend_type = Blender::MULTI_BAND;
float blend_strength = 5; float blend_strength = 5;