Merge pull request #11124 from terfendail:minenctriangle_fix

This commit is contained in:
Alexander Alekhin 2018-03-22 10:23:09 +00:00
commit b390e86b12

View File

@ -988,14 +988,15 @@ static bool findGammaIntersectionPoints(const std::vector<cv::Point2f> &polygon,
double sideCExtraParam = 2 * polygonPointHeight * distFormulaDenom;
// Get intersection points if they exist or if lines are identical
if (!areIntersectingLines(side1Params, side2Params, sideCExtraParam, intersectionPoint1, intersectionPoint2)) {
return false;
if (areIntersectingLines(side1Params, side2Params, sideCExtraParam, intersectionPoint1, intersectionPoint2)) {
return true;
} else if (areIdenticalLines(side1Params, side2Params, sideCExtraParam)) {
intersectionPoint1 = side1StartVertex;
intersectionPoint2 = side1EndVertex;
return true;
}
return true;
return false;
}
//! Check if the given lines are identical or not