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

make ocl surf sample compile on Linux

Browse Source
This commit is contained in:
yao 2012-09-13 17:34:06 +08:00
parent 35b671efb5
commit 04e946b2a3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/ocl/surf_matcher.cpp
View File

@ -44,7 +44,7 @@
//M*/ //M*/
#include <iostream> #include <iostream>
#include <stdio.h>
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp" #include "opencv2/features2d/features2d.hpp"
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
@ -58,7 +58,7 @@ using namespace cv::ocl;
//#define USE_CPU_DESCRIPTOR // use cpu descriptor extractor until ocl descriptor extractor is fixed //#define USE_CPU_DESCRIPTOR // use cpu descriptor extractor until ocl descriptor extractor is fixed
//#define USE_CPU_BFMATCHER //#define USE_CPU_BFMATCHER
void help();
void help() void help()
{ {
@ -169,7 +169,7 @@ int main(int argc, char* argv[])
double max_dist = 0; double min_dist = 100; double max_dist = 0; double min_dist = 100;
//-- Quick calculation of max and min distances between keypoints //-- Quick calculation of max and min distances between keypoints
for( int i = 0; i < keypoints1.size(); i++ ) for( size_t i = 0; i < keypoints1.size(); i++ )
{ {
double dist = matches[i].distance; double dist = matches[i].distance;
if( dist < min_dist ) min_dist = dist; if( dist < min_dist ) min_dist = dist;
@ -182,7 +182,7 @@ int main(int argc, char* argv[])
//-- Draw only "good" matches (i.e. whose distance is less than 2.5*min_dist ) //-- Draw only "good" matches (i.e. whose distance is less than 2.5*min_dist )
std::vector< DMatch > good_matches; std::vector< DMatch > good_matches;
for( int i = 0; i < keypoints1.size(); i++ ) for( size_t i = 0; i < keypoints1.size(); i++ )
{ {
if( matches[i].distance < 3*min_dist ) if( matches[i].distance < 3*min_dist )
{ {
@ -200,7 +200,7 @@ int main(int argc, char* argv[])
std::vector<Point2f> obj; std::vector<Point2f> obj;
std::vector<Point2f> scene; std::vector<Point2f> scene;
for( int i = 0; i < good_matches.size(); i++ ) for( size_t i = 0; i < good_matches.size(); i++ )
{ {
//-- Get the keypoints from the good matches //-- Get the keypoints from the good matches
obj.push_back( keypoints1[ good_matches[i].queryIdx ].pt ); obj.push_back( keypoints1[ good_matches[i].queryIdx ].pt );