Merge pull request opencv#6854 from sturkmen72:patch-8

vpisarev · vpisarev · commit 2e056fbe8ae6 · 2017-05-24T12:45:00.000Z
diff --git a/modules/imgproc/src/min_enclosing_triangle.cpp b/modules/imgproc/src/min_enclosing_triangle.cpp
@@ -727,7 +727,7 @@ static bool isValidMinimalTriangle(const cv::Point2f &vertexA, const cv::Point2f
                           ? (areEqualPoints(midpointSideB, polygon[b]))
                           : (isPointOnLineSegment(midpointSideB, sideBStartVertex, sideBEndVertex));
 
-    bool sideCValid = isPointOnLineSegment(midpointSideC, sideCStartVertex, sideCEndVertex);
+    bool sideCValid = (validationFlag == VALIDATION_SIDES_FLUSH) || isPointOnLineSegment(midpointSideC, sideCStartVertex, sideCEndVertex);
 
     return (sideAValid && sideBValid && sideCValid);
 }

Original file line number	Diff line number	Diff line change
`@@ -727,7 +727,7 @@ static bool isValidMinimalTriangle(const cv::Point2f &vertexA, const cv::Point2f`
`727`	`727`	`? (areEqualPoints(midpointSideB, polygon[b]))`
`728`	`728`	`: (isPointOnLineSegment(midpointSideB, sideBStartVertex, sideBEndVertex));`
`729`	`729`
`730`		`- bool sideCValid = isPointOnLineSegment(midpointSideC, sideCStartVertex, sideCEndVertex);`
	`730`	`+ bool sideCValid = (validationFlag == VALIDATION_SIDES_FLUSH) \|\| isPointOnLineSegment(midpointSideC, sideCStartVertex, sideCEndVertex);`
`731`	`731`
`732`	`732`	`return (sideAValid && sideBValid && sideCValid);`
`733`	`733`	`}`