From ae779db8fbd24bf8293766c231ef6d20102a0ba2 Mon Sep 17 00:00:00 2001
From: Dennis Evangelista <evangeli@usna.edu>
Date: Fri, 28 Jul 2017 16:25:05 -0400
Subject: [PATCH] To make cvcalibinit3.o work I had to change how it includes
 the core libraries

---
 cvcalibinit3.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/cvcalibinit3.cpp b/cvcalibinit3.cpp
index 9ffc933..6ecdc8f 100644
--- a/cvcalibinit3.cpp
+++ b/cvcalibinit3.cpp
@@ -31,7 +31,8 @@ If you use this code, please cite the following articles:
 //===========================================================================
 // Include files
 #include <opencv.hpp>
-#include <opencv2/core/internal.hpp>
+//#include <opencv2/core/internal.hpp>
+#include <opencv2/core/core.hpp>
 
 #include <time.h>
 #include <fstream>
@@ -159,7 +160,7 @@ int cvFindChessboardCorners3( const void* arr, CvSize pattern_size,
 	
 	// Set openCV function name and label the function start
     CV_FUNCNAME( "cvFindChessBoardCornerGuesses2" );
-    __BEGIN__;
+    __CV_BEGIN__;
 
 
 	// Further initializations
@@ -524,7 +525,7 @@ int cvFindChessboardCorners3( const void* arr, CvSize pattern_size,
 	// If enough corners have been found already, then there is no need for PART 2 ->EXIT
 	found = mrWriteCorners( output_quad_group, max_count, pattern_size, min_number_of_corners);
 		if (found == -1 || found == 1)
-			EXIT;
+			exit(0);
 
 	// PART 2: AUGMENT LARGEST PATTERN
 	//-----------------------------------------------------------------------
@@ -753,18 +754,18 @@ int cvFindChessboardCorners3( const void* arr, CvSize pattern_size,
 
 
 				// write the found corners to output array
-				// Go to __END__, if enough corners have been found
+				// Go to __CV_END__, if enough corners have been found
 				found = mrWriteCorners( output_quad_group, max_count, pattern_size, min_number_of_corners);
 				if (found == -1 || found == 1)
-					EXIT;
+					exit(0);
 			}
 		}
 	}
 
 
 	// "End of file" jump point
-	// After the command "EXIT" the code jumps here
-    __END__;
+	// After the command "exit(0)" the code jumps here
+    __CV_END__;
 
 
 	/*
@@ -821,9 +822,9 @@ icvCleanFoundConnectedQuads( int quad_count, CvCBQuad **quad_group, CvSize patte
 
     CV_FUNCNAME( "icvCleanFoundConnectedQuads" );
 
-    __BEGIN__;
+    __CV_BEGIN__;
 
-    CvPoint2D32f center = {0,0};
+    CvPoint2D32f center = CvPoint2D32f(0,0);
     int i, j, k;
 
 
@@ -835,7 +836,7 @@ icvCleanFoundConnectedQuads( int quad_count, CvCBQuad **quad_group, CvSize patte
 	// or ones which don't belong to the pattern rectangle. Else go to the end
 	// of the function
     if( quad_count <= count )
-        EXIT;
+        exit(0);
 
 
     // Create an array of quadrangle centers
@@ -844,7 +845,7 @@ icvCleanFoundConnectedQuads( int quad_count, CvCBQuad **quad_group, CvSize patte
 
     for( i = 0; i < quad_count; i++ )
     {
-        CvPoint2D32f ci = {0,0};
+      CvPoint2D32f ci = CvPoint2D32f(0,0);
         CvCBQuad* q = quad_group[i];
 
         for( j = 0; j < 4; j++ )
@@ -932,7 +933,7 @@ icvCleanFoundConnectedQuads( int quad_count, CvCBQuad **quad_group, CvSize patte
         centers[min_box_area_index] = centers[quad_count];
     }
 
-    __END__;
+    __CV_END__;
 
     cvReleaseMemStorage( &temp_storage );
     cvFree( &centers );
@@ -2087,7 +2088,7 @@ icvGenerateQuads( CvCBQuad **out_quads, CvCBCorner **out_corners,
 
     CV_FUNCNAME( "icvGenerateQuads" );
 
-    __BEGIN__;
+    __CV_BEGIN__;
 
     CvSeq *src_contour = 0;
     CvSeq *root;
@@ -2240,7 +2241,7 @@ icvGenerateQuads( CvCBQuad **out_quads, CvCBCorner **out_corners,
         quad_count++;
     }
 
-    __END__;
+    __CV_END__;
 
     if( cvGetErrStatus() < 0 )
     {