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

added first version of public stitching API, added simple sample which uses that API, old sample renamed to stitching_detailed

Browse Source
This commit is contained in:
Alexey Spizhevoy
2011-09-07 11:14:27 +00:00
parent 1449dd1f02
commit c9a41c6802
19 changed files with 1285 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ public:
num_layers_descr_ = num_layers_descr;
}
void releaseMemory();
void collectGarbage();
protected:
void find(const Mat &image, ImageFeatures &features);
@@ -136,7 +136,7 @@ void GpuSurfFeaturesFinder::find(const Mat &image, ImageFeatures &features)
descriptors_.download(features.descriptors);
}
void GpuSurfFeaturesFinder::releaseMemory()
void GpuSurfFeaturesFinder::collectGarbage()
{
surf_.releaseMemory();
image_.release();
@@ -231,7 +231,7 @@ public:
GpuMatcher(float match_conf) : match_conf_(match_conf) {}
void match(const ImageFeatures &features1, const ImageFeatures &features2, MatchesInfo& matches_info);
void releaseMemory();
void collectGarbage();
private:
float match_conf_;
@@ -326,7 +326,7 @@ void GpuMatcher::match(const ImageFeatures &features1, const ImageFeatures &feat
}
}
void GpuMatcher::releaseMemory()
void GpuMatcher::collectGarbage()
{
descriptors1_.release();
descriptors2_.release();
@@ -369,9 +369,9 @@ void SurfFeaturesFinder::find(const Mat &image, ImageFeatures &features)
}
void SurfFeaturesFinder::releaseMemory()
void SurfFeaturesFinder::collectGarbage()
{
impl_->releaseMemory();
impl_->collectGarbage();
}
@@ -511,9 +511,9 @@ void BestOf2NearestMatcher::match(const ImageFeatures &features1, const ImageFea
matches_info.H = findHomography(src_points, dst_points, CV_RANSAC);
}
void BestOf2NearestMatcher::releaseMemory()
void BestOf2NearestMatcher::collectGarbage()
{
impl_->releaseMemory();
impl_->collectGarbage();
}
} // namespace detail