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

cppcheck: fix some reports

Browse Source 
All of these: (performance) Prefer prefix ++/-- operators for non-primitive types.
[modules/calib3d/src/fundam.cpp:1049] -> [modules/calib3d/src/fundam.cpp:1049]: (style) Same expression on both sides of '&&'.
This commit is contained in:
Julien Nabet
2016-04-29 15:41:39 +02:00
parent 6e5e5d87df
commit a29c814bd8
14 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/cpp/matchmethod_orb_akaze_brisk.cpp
View File

@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
// Descriptor loop
vector<String>::iterator itDesc;
for (itDesc = typeDesc.begin(); itDesc != typeDesc.end(); itDesc++)
for (itDesc = typeDesc.begin(); itDesc != typeDesc.end(); ++itDesc)
{
Ptr<DescriptorMatcher> descriptorMatcher;
// Match between img1 and img2
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
// or detect and compute descriptors in one step
b->detectAndCompute(img2, Mat(),keyImg2, descImg2,false);
// Match method loop
for (itMatcher = typeAlgoMatch.begin(); itMatcher != typeAlgoMatch.end(); itMatcher++){
for (itMatcher = typeAlgoMatch.begin(); itMatcher != typeAlgoMatch.end(); ++itMatcher){
descriptorMatcher = DescriptorMatcher::create(*itMatcher);
if ((*itMatcher == "BruteForce-Hamming" || *itMatcher == "BruteForce-Hamming(2)") && (b->descriptorType() == CV_32F || b->defaultNorm() <= NORM_L2SQR))
{
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
cout << "in img1\tin img2\n";
// Use to compute distance between keyPoint matches and to evaluate match algorithm
double cumSumDist2=0;
for (it = bestMatches.begin(); it != bestMatches.end(); it++)
for (it = bestMatches.begin(); it != bestMatches.end(); ++it)
{
cout << it->queryIdx << "\t" << it->trainIdx << "\t" << it->distance << "\n";
Point2d p=keyImg1[it->queryIdx].pt-keyImg2[it->trainIdx].pt;
@@ -165,15 +165,15 @@ int main(int argc, char *argv[])
int i=0;
cout << "Cumulative distance between keypoint match for different algorithm and feature detector \n\t";
cout << "We cannot say which is the best but we can say results are differents! \n\t";
for (vector<String>::iterator itMatcher = typeAlgoMatch.begin(); itMatcher != typeAlgoMatch.end(); itMatcher++)
for (vector<String>::iterator itMatcher = typeAlgoMatch.begin(); itMatcher != typeAlgoMatch.end(); ++itMatcher)
{
cout<<*itMatcher<<"\t";
}
cout << "\n";
for (itDesc = typeDesc.begin(); itDesc != typeDesc.end(); itDesc++)
for (itDesc = typeDesc.begin(); itDesc != typeDesc.end(); ++itDesc)
{
cout << *itDesc << "\t";
for (vector<String>::iterator itMatcher = typeAlgoMatch.begin(); itMatcher != typeAlgoMatch.end(); itMatcher++, i++)
for (vector<String>::iterator itMatcher = typeAlgoMatch.begin(); itMatcher != typeAlgoMatch.end(); ++itMatcher, ++i)
{
cout << desMethCmp[i]<<"\t";
}