fixup! Fixed several merge issues

8215d20d · Maksim Shabunin · 2a350b11 · 8215d20d
Commit 8215d20d authored Jul 13, 2016 by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

checkchessboard.cpp modules/calib3d/src/checkchessboard.cpp +2 -0

No files found.
--- 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<std::pair<float, int> >& quads, int class_id)
 {
    const float min_aspect_ratio = 0.2f;