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

renamed gpufeatures2d -> cudafeatures2d

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-07-24 10:27:59 +04:00
parent 5660d6a680
commit 259ceb7eaa
29 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@ private:
float match_conf_;
};
#ifdef HAVE_OPENCV_GPUFEATURES2D
#ifdef HAVE_OPENCV_CUDAFEATURES2D
class GpuMatcher : public FeaturesMatcher
{
public:
@@ -200,7 +200,7 @@ void CpuMatcher::match(const ImageFeatures &features1, const ImageFeatures &feat
LOG("1->2 & 2->1 matches: " << matches_info.matches.size() << endl);
}
#ifdef HAVE_OPENCV_GPUFEATURES2D
#ifdef HAVE_OPENCV_CUDAFEATURES2D
void GpuMatcher::match(const ImageFeatures &features1, const ImageFeatures &features2, MatchesInfo& matches_info)
{
matches_info.matches.clear();
@@ -531,7 +531,7 @@ BestOf2NearestMatcher::BestOf2NearestMatcher(bool try_use_gpu, float match_conf,
{
(void)try_use_gpu;
#ifdef HAVE_OPENCV_GPUFEATURES2D
#ifdef HAVE_OPENCV_CUDAFEATURES2D
if (try_use_gpu && getCudaEnabledDeviceCount() > 0)
{
impl_ = new GpuMatcher(match_conf);

4
modules/stitching/src/precomp.hpp
View File

@@ -76,8 +76,8 @@
# include "opencv2/cudawarping.hpp"
#endif
#ifdef HAVE_OPENCV_GPUFEATURES2D
# include "opencv2/gpufeatures2d.hpp"
#ifdef HAVE_OPENCV_CUDAFEATURES2D
# include "opencv2/cudafeatures2d.hpp"
#endif
#ifdef HAVE_OPENCV_GPU