Removed call to printShortCudaDeviceInfo() since not available in OpenCV v2.3

shervinemami · shervinemami · commit 8736df11c2ec · 2013-03-06T22:42:24.000-08:00
diff --git a/Chapter4_StructureFromMotion/GPUSURFFeatureMatcher.cpp b/Chapter4_StructureFromMotion/GPUSURFFeatureMatcher.cpp
@@ -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();
 	
@@ -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 );)
 		}
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,15 @@`
`20`	`20`
`21`	`21`	`using namespace std;`
`22`	`22`	`using namespace cv;`
`23`		`-using namespace cv::core;`
`24`	`23`	`using namespace cv::gpu;`
`25`	`24`
`26`	`25`	`//c'tor`
`27`	`26`	`GPUSURFFeatureMatcher::GPUSURFFeatureMatcher(vector<cv::Mat>& imgs_,`
`28`	`27`	`vector<std::vector<cv::KeyPoint> >& imgpts_) :`
`29`	`28`	`imgpts(imgpts_),use_ratio_test(true)`
`30`	`29`	`{`
`31`		`- printShortCudaDeviceInfo(cv::gpu::getDevice());`
	`30`	`+ // The helper function printShortCudaDeviceInfo() moved between OpenCV v2.3 and v2.4, so might not compile.`
	`31`	`+ //printShortCudaDeviceInfo(cv::gpu::getDevice());`
`32`	`32`
`33`	`33`	`extractor = new gpu::SURF_GPU();`
`34`	`34`
`@@ -103,4 +103,4 @@ void GPUSURFFeatureMatcher::MatchFeatures(int idx_i, int idx_j, vector<DMatch>*`
`103`	`103`	`CV_PROFILE("match",matcher.match( descriptors_1, descriptors_2, *matches );)`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`-}`
	`106`	`+}`