Merge pull request #6241 from cbalint13:agast

This commit is contained in:
Vadim Pisarevsky 2016-03-12 16:38:39 +00:00
commit da82acda6b

View File

@ -793,7 +793,7 @@ static void AGAST_5_8(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
keypoints.reserve(nExpectedCorners);
}
}
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 1.0f));
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 7.0f));
total++;
goto homogeneous;
success_structured:
@ -810,7 +810,7 @@ static void AGAST_5_8(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
keypoints.reserve(nExpectedCorners);
}
}
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 1.0f));
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 7.0f));
total++;
goto structured;
}
@ -3237,7 +3237,7 @@ static void AGAST_7_12d(InputArray _img, std::vector<KeyPoint>& keypoints, int t
keypoints.reserve(nExpectedCorners);
}
}
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 1.0f));
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 7.0f));
total++;
goto homogeneous;
success_structured:
@ -3254,7 +3254,7 @@ static void AGAST_7_12d(InputArray _img, std::vector<KeyPoint>& keypoints, int t
keypoints.reserve(nExpectedCorners);
}
}
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 1.0f));
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 7.0f));
total++;
goto structured;
}
@ -5319,7 +5319,7 @@ static void AGAST_7_12s(InputArray _img, std::vector<KeyPoint>& keypoints, int t
keypoints.reserve(nExpectedCorners);
}
}
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 1.0f));
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 7.0f));
total++;
goto homogeneous;
success_structured:
@ -5336,7 +5336,7 @@ static void AGAST_7_12s(InputArray _img, std::vector<KeyPoint>& keypoints, int t
keypoints.reserve(nExpectedCorners);
}
}
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 1.0f));
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 7.0f));
total++;
goto structured;
}
@ -7440,7 +7440,7 @@ static void OAST_9_16(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
keypoints.reserve(nExpectedCorners);
}
}
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 1.0f));
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 7.0f));
total++;
}
}
@ -7892,7 +7892,7 @@ static void AGAST_ALL(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
keypoints.reserve(nExpectedCorners);
}
}
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 1.0f));
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 7.0f));
total++;
goto homogeneous;
success_structured:
@ -7909,7 +7909,7 @@ static void AGAST_ALL(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
keypoints.reserve(nExpectedCorners);
}
}
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 1.0f));
keypoints.push_back(KeyPoint(Point2f((float)x, (float)y), 7.0f));
total++;
goto structured;
}