Skip to content

Commit

Permalink
Removed call to printShortCudaDeviceInfo() since not available in Ope…
Browse files Browse the repository at this point in the history
…nCV v2.3
  • Loading branch information
shervinemami committed Mar 7, 2013
1 parent a7a56c7 commit 8736df1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Chapter4_StructureFromMotion/GPUSURFFeatureMatcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@

using namespace std;
using namespace cv;
using namespace cv::core;
using namespace cv::gpu;

//c'tor
GPUSURFFeatureMatcher::GPUSURFFeatureMatcher(vector<cv::Mat>& imgs_,
vector<std::vector<cv::KeyPoint> >& imgpts_) :
imgpts(imgpts_),use_ratio_test(true)
{
printShortCudaDeviceInfo(cv::gpu::getDevice());
// The helper function printShortCudaDeviceInfo() moved between OpenCV v2.3 and v2.4, so might not compile.
//printShortCudaDeviceInfo(cv::gpu::getDevice());

extractor = new gpu::SURF_GPU();

Expand Down Expand Up @@ -103,4 +103,4 @@ void GPUSURFFeatureMatcher::MatchFeatures(int idx_i, int idx_j, vector<DMatch>*
CV_PROFILE("match",matcher.match( descriptors_1, descriptors_2, *matches );)
}
}
}
}

0 comments on commit 8736df1

Please sign in to comment.