Merge branch 'develop'

Merge branch 'develop'

hello_world.cpp

@@ -0,0 +1,19 @@
+#include "opencv2/opencv.hpp"
+#include "opencv2/highgui/highgui.hpp"
+
+int main()
+{
+	//initialize a matrix of black pixels
+	cv ::Mat img = cv::Mat::zeros(120,350,CV_8UC3);
+	
+	//write text on image
+	putText(img, "Hello World", cv::Point(15,70), cv::FONT_HERSHEY_PLAIN, 3, cv::Scalar(0,255,0),4);;
+	
+	//display the image
+	imshow("Win",img);
+	
+	//wait for a key press to exit
+	cv::waitKey(0);
+	
+	return 0;
+}

main.cpp

@@ -1,5 +1,6 @@
 #include <iostream>
 #include "arithmetic.h"
+#include "opencv2/opencv.hpp"
 int main()
 {
 

makefile.txt

@@ -0,0 +1,17 @@
+all: main arithmetic hello_world
+	g++ main.o arithmetic.o -L/usr/lib/x86_64-linux-gnu -lopencv_core
+	g++ hello_world.o -o hello -L/usr/lib/x86_64-linux-gnu -lopencv_core  
+	 
+main: main.cpp
+	g++ -c main.cpp -I/usr/include/opencv4
+
+arithmetic: arithmetic.cpp arithmetic.h
+	g++ -c arithmetic.cpp
+
+clean:
+	rm*.o
+	rm a.out
+
+hello_world: hello_world.cpp
+	g++ -c hello_world.cpp  -I/usr/include/opencv4
+