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

Trailing whitespace

Browse Source
This commit is contained in:
laurentBerger 2015-05-03 11:58:32 +02:00
parent 3e25c085ba
commit b28056e3dd
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/cpp/matchmethod_orb_akaze_brisk.cpp
View File

@ -12,7 +12,7 @@ int main(void)
typeAlgoMatch.push_back("BruteForce"); typeAlgoMatch.push_back("BruteForce");
typeAlgoMatch.push_back("BruteForce-Hamming"); typeAlgoMatch.push_back("BruteForce-Hamming");
typeAlgoMatch.push_back("BruteForce-Hamming(2)"); typeAlgoMatch.push_back("BruteForce-Hamming(2)");
vector<String> typeDesc; vector<String> typeDesc;
typeDesc.push_back("AKAZE"); typeDesc.push_back("AKAZE");
typeDesc.push_back("ORB"); typeDesc.push_back("ORB");
@ -22,7 +22,7 @@ int main(void)
vector<String> fileName; vector<String> fileName;
fileName.push_back("basketball1.png"); fileName.push_back("basketball1.png");
fileName.push_back("basketball2.png"); fileName.push_back("basketball2.png");
Mat img1 = imread(dataFolder+fileName[0], IMREAD_GRAYSCALE); Mat img1 = imread(dataFolder+fileName[0], IMREAD_GRAYSCALE);
Mat img2 = imread(dataFolder+fileName[1], IMREAD_GRAYSCALE); Mat img2 = imread(dataFolder+fileName[1], IMREAD_GRAYSCALE);
@ -61,19 +61,15 @@ int main(void)
tab.at<float>(i, 0) = matches[i].distance; tab.at<float>(i, 0) = matches[i].distance;
sortIdx(tab, index, SORT_EVERY_COLUMN + SORT_ASCENDING); sortIdx(tab, index, SORT_EVERY_COLUMN + SORT_ASCENDING);
vector<DMatch> bestMatches; /*<! best match */ vector<DMatch> bestMatches; /*<! best match */
for (int i = 0; i<30; i++) for (int i = 0; i<30; i++)
bestMatches.push_back(matches[index.at<int>(i, 0)]); bestMatches.push_back(matches[index.at<int>(i, 0)]);
Mat result; Mat result;
drawMatches(img1, keyImg1, img2, keyImg2, bestMatches, result); drawMatches(img1, keyImg1, img2, keyImg2, bestMatches, result);
namedWindow(*itDesc+": "+*itMatcher, WINDOW_AUTOSIZE); namedWindow(*itDesc+": "+*itMatcher, WINDOW_AUTOSIZE);
imshow(*itDesc + ": " + *itMatcher, result); imshow(*itDesc + ": " + *itMatcher, result);
FileStorage fs(*itDesc+"_"+*itMatcher+"_"+fileName[0]+"_"+fileName[1]+".xml", FileStorage::WRITE); FileStorage fs(*itDesc+"_"+*itMatcher+"_"+fileName[0]+"_"+fileName[1]+".xml", FileStorage::WRITE);
fs<<"Matches"<<matches; fs<<"Matches"<<matches;
vector<DMatch>::iterator it; vector<DMatch>::iterator it;
cout << "Index \tIndex \tindex \tdistance\n"; cout << "Index \tIndex \tindex \tdistance\n";
cout << "in img1\tin img2\timage\t\n"; cout << "in img1\tin img2\timage\t\n";
for (it = matches.begin(); it != matches.end(); it++) for (it = matches.begin(); it != matches.end(); it++)