Can load a file into a Mat, and display it in the Window

Signed-off-by: deadprogram <[email protected]>

core.cpp

@@ -1,6 +1,10 @@
 #include "core.h"
 #include <string.h>
 
+Mat Mat_New() {
+    return new cv::Mat();
+}
+
 MatVec3b MatVec3b_New() {
     return new cv::Mat_<cv::Vec3b>();
 }

core.go

@@ -18,6 +18,19 @@ const (
 	CvCapPropFps = 5
 )
 
+// CMat is an alias for C pointer.
+type CMat C.Mat
+
+// Mat is a bind of `cv::Mat
+type Mat struct {
+	p C.Mat
+}
+
+// NewMat returns a new Mat.
+func NewMat() Mat {
+	return Mat{p: C.Mat_New()}
+}
+
 // CMatVec3b is an alias for C pointer.
 type CMatVec3b C.MatVec3b
 

core.h

@@ -27,16 +27,20 @@ typedef struct RawData {
   } Rects;
 
   #ifdef __cplusplus
+  typedef cv::Mat* Mat;
   typedef cv::Mat_<cv::Vec3b>* MatVec3b;
   typedef cv::Mat_<cv::Vec4b>* MatVec4b;
   #else
+  typedef void* Mat;
   typedef void* MatVec3b;
   typedef void* MatVec4b;
   #endif
 
   void Rects_Delete(struct Rects rs);
   void DrawRectsToImage(MatVec3b img, struct Rects rects);
 
+  Mat Mat_New();
+
   MatVec3b MatVec3b_New();
   struct ByteArray MatVec3b_ToJpegData(MatVec3b m, int quality);
   void MatVec3b_Delete(MatVec3b m);

examples/window.go

@@ -1,15 +1,22 @@
+// how to use
+// 		go run ./examples/window.go /home/ron/Pictures/mcp23017.jpg
+//
 package main
 
 import (
+	"os"
 	"time"
 
 	opencv3 ".."
 )
 
 func main() {
-	opencv3.NewWindow("Hello")
+	filename := os.Args[1]
+	window := opencv3.NewWindow("Hello")
+	img := opencv3.IMRead(filename, 1)
 
 	for {
+		window.IMShow(img)
 		opencv3.WaitKey(1)
 		time.Sleep(100 * time.Microsecond)
 	}

highgui.cpp

@@ -9,7 +9,7 @@ void Window_Delete(const char* winname) {
     cv::destroyWindow(winname);
 }
 
-void Window_IMShow(const char* winname, MatVec3b mat) {
+void Window_IMShow(const char* winname, Mat mat) {
     cv::imshow(winname, *mat);
 }
 

highgui.go

@@ -33,7 +33,7 @@ func (w *Window) Delete() {
 }
 
 // IMShow takes an image Mat and displays it in the Window
-func (w *Window) IMShow(img MatVec3b) {
+func (w *Window) IMShow(img Mat) {
 	cName := C.CString(w.name)
 	defer C.free(unsafe.Pointer(cName))
 

highgui.h

@@ -11,7 +11,7 @@ extern "C" {
 // Window
 void Window_New(const char* winname, int flags);
 void Window_Delete(const char* winname);
-void Window_IMShow(const char* winname, MatVec3b mat);
+void Window_IMShow(const char* winname, Mat mat);
 int Window_WaitKey(int);
 
 

imgcodecs.cpp

@@ -0,0 +1,7 @@
+#include "imgcodecs.h"
+
+// Image
+Mat Image_IMRead(const char* filename, int flags) {
+    cv::Mat img = cv::imread(filename, flags);
+    return new cv::Mat(img);
+}

imgcodecs.go

@@ -0,0 +1,18 @@
+package opencv3
+
+/*
+#include <stdlib.h>
+#include "imgcodecs.h"
+*/
+import "C"
+import (
+	"unsafe"
+)
+
+// IMRead reads an image file into a Mat
+func IMRead(name string, flags int) Mat {
+	cName := C.CString(name)
+	defer C.free(unsafe.Pointer(cName))
+
+	return Mat{p: C.Image_IMRead(cName, C.int(flags))}
+}

imgcodecs.h

@@ -0,0 +1,17 @@
+#ifndef _OPENCV3_IMGCODECS_H_
+#define _OPENCV3_IMGCODECS_H_
+
+#ifdef __cplusplus
+#include <opencv2/opencv.hpp>
+extern "C" {
+#endif
+
+#include "core.h"
+
+Mat Image_IMRead(const char* filename, int flags);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //_OPENCV3_IMGCODECS_H_