From 937ebb4d70daf48701af6fe06bec71425fe59532 Mon Sep 17 00:00:00 2001
From: Dennis Evangelista <evangeli@usna.edu>
Date: Fri, 28 Jul 2017 16:23:56 -0400
Subject: [PATCH] Fixes to make main.o target work include CvSize constructor
 and changes to Makefile to reflect correct libraries.

---
 .gitignore |  1 +
 Makefile   |  8 ++++----
 main.cpp   | 19 ++++++++++++-------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index eb50090..861b1b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ cToMatlab
 outputImages
 *~
 *.jpg
+*.o
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 2dd9004..0d3b351 100644
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,15 @@ INCS =
 LIBS = 
 
 
-DEFINCS = -I/usr/include -I/usr/include/opencv2
-DEFLIBS = -L/usr/lib 
-LINKLIBS = -lopencv_core -lopencv_highgui -lopencv_imgproc 
+DEFINCS = -I/usr/local/include/opencv -I/usr/local/include/opencv2 
+DEFLIBS = -L/usr/local/lib  
+LINKLIBS = -lopencv_core -lopencv_highgui -lopencv_imgproc -lopencv_video -lopencv_imgcodecs -lopencv_cvv -lopencv_videoio
 
 CPP  = g++
 CC   = gcc
 OBJ  = main.o cvcalibinit3.o 
 LINKOBJ  = main.o cvcalibinit3.o 
-BIN  = FindCorners.exe
+BIN  = FindCorners
 RM = rm -f
 
 
diff --git a/main.cpp b/main.cpp
index 191022a..0a89860 100644
--- a/main.cpp
+++ b/main.cpp
@@ -37,6 +37,9 @@ If you use this code, please cite the following articles:
 #include <string.h>
 #include <time.h>
 
+#include <opencv/cv.h>
+#include <opencv/highgui.h>
+
 #include <fstream>
 using namespace std;
 using std::ifstream;
@@ -58,7 +61,7 @@ int main( int argc, char** argv )
 
 
 	// Initializations
-	CvSize board_size				= {7,6};
+	CvSize board_size				= CvSize(7,6);
 	const char* input_filename		= 0;
 	CvCapture* capture				= 0;
 	FILE* f							= 0;
@@ -67,7 +70,7 @@ int main( int argc, char** argv )
 	CvSeq* image_points_seq			= 0;
 	int elem_size;
 	CvPoint2D32f* image_points_buf	= 0;
-	CvSize img_size					= {0,0};
+	CvSize img_size					= CvSize(0,0);
 	int found						= -2;
 	int min_number_of_corners		= 42;
 	input_filename					= "pictures.txt";
@@ -158,8 +161,9 @@ int main( int argc, char** argv )
 	{
 		// Initializations
 		IplImage *view = 0, *view_gray = 0;
-		int count = 0, blink = 0;
-		CvSize text_size = {0,0};
+	  
+	  int count = 0, blink = 0;
+		CvSize text_size = CvSize(0,0);
 		int base_line = 0;
 		// Load the correct image...
 		if( f && fgets( imagename, sizeof(imagename)-2, f ))
@@ -189,10 +193,11 @@ int main( int argc, char** argv )
 		// ...Or capture the correct frame from the video
 		else if( capture )
 		{
-			IplImage* view0 = cvQueryFrame( capture );
-			if( view0 )
+		  IplImage* view0 = cvQueryFrame( capture );
+		  
+		  if( view0 )
 			{
-				view = cvCreateImage( cvGetSize(view0), IPL_DEPTH_8U, view0->nChannels );
+			  //view = cvLoadImage( cvGetSize(view0), IPL_DEPTH_8U, view0->nChannels );
 				if( view0->origin == IPL_ORIGIN_BL )
 					cvFlip( view0, view, 0 );
 				else