From 8215d20dbf4a380dab75c397e39c9c3e59a75de8 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Wed, 13 Jul 2016 12:11:44 +0300 Subject: [PATCH] fixup! Fixed several merge issues --- modules/calib3d/src/checkchessboard.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/calib3d/src/checkchessboard.cpp b/modules/calib3d/src/checkchessboard.cpp index 5ecd37faab..5f954617d3 100644 --- a/modules/calib3d/src/checkchessboard.cpp +++ b/modules/calib3d/src/checkchessboard.cpp @@ -57,6 +57,8 @@ # endif #endif +int cvCheckChessboardBinary(IplImage* src, CvSize size); + static void icvGetQuadrangleHypotheses(CvSeq* contours, std::vector >& quads, int class_id) { const float min_aspect_ratio = 0.2f;