Fix printShortCudaDeviceInfo() for old versions of OpenCV in Ch4

shervinemami · shervinemami · commit b5a65e281b5e · 2013-01-28T08:33:14.000-08:00
diff --git a/Chapter4_StructureFromMotion/GPUSURFFeatureMatcher.cpp b/Chapter4_StructureFromMotion/GPUSURFFeatureMatcher.cpp
@@ -20,14 +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)
 {
-	cv::gpu::printShortCudaDeviceInfo(cv::gpu::getDevice());
+	printShortCudaDeviceInfo(cv::gpu::getDevice());
 
 	extractor = new gpu::SURF_GPU();
 	
@@ -102,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,14 +20,15 @@`
`20`	`20`
`21`	`21`	`using namespace std;`
`22`	`22`	`using namespace cv;`
	`23`	`+using namespace cv::core;`
`23`	`24`	`using namespace cv::gpu;`
`24`	`25`
`25`	`26`	`//c'tor`
`26`	`27`	`GPUSURFFeatureMatcher::GPUSURFFeatureMatcher(vector<cv::Mat>& imgs_,`
`27`	`28`	`vector<std::vector<cv::KeyPoint> >& imgpts_) :`
`28`	`29`	`imgpts(imgpts_),use_ratio_test(true)`
`29`	`30`	`{`
`30`		`- cv::gpu::printShortCudaDeviceInfo(cv::gpu::getDevice());`
	`31`	`+ printShortCudaDeviceInfo(cv::gpu::getDevice());`
`31`	`32`
`32`	`33`	`extractor = new gpu::SURF_GPU();`
`33`	`34`
`@@ -102,4 +103,4 @@ void GPUSURFFeatureMatcher::MatchFeatures(int idx_i, int idx_j, vector<DMatch>*`
`102`	`103`	`CV_PROFILE("match",matcher.match( descriptors_1, descriptors_2, *matches );)`
`103`	`104`	`}`
`104`	`105`	`}`
`105`		`-}`
	`106`	`+}`