Merge pull request #65 from deltamobile/updated_gonum_matrix

Updated gonum matrix
Remove erroneous ColView() calls.
2016-01-27 00:08:56 +08:00 · 2016-01-26 10:00:06 -06:00 · 2016-01-26 09:56:45 -06:00 · 2016-01-17 09:36:11 +08:00 · 2016-01-07 10:59:43 -08:00 · 2015-11-06 21:47:26 +08:00
8 changed files with 266 additions and 19 deletions
--- a/gocv/gocv_calib3d.go
+++ b/gocv/gocv_calib3d.go
@ -24,11 +24,11 @@ func GcvInitCameraMatrix2D(objPts, imgPts *mat64.Dense, dims [2]int,
 	imgPtsVec := NewGcvPoint2f32Vector(int64(nObjPts))

 	for j := 0; j < nObjPts; j++ {
-		objPtsVec.Set(j, NewGcvPoint3f32(objPts.Col(nil, j)...))
+		objPtsVec.Set(j, NewGcvPoint3f32(mat64.Col(nil, j, objPts)...))
 	}

 	for j := 0; j < nObjPts; j++ {
-		imgPtsVec.Set(j, NewGcvPoint2f32(imgPts.Col(nil, j)...))
+		imgPtsVec.Set(j, NewGcvPoint2f32(mat64.Col(nil, j, imgPts)...))
 	}

 	_imgSize := NewGcvSize2i(dims[0], dims[1])
@ -52,11 +52,11 @@ func GcvCalibrateCamera(objPts, imgPts, camMat, distCoeffs *mat64.Dense,
 	imgPtsVec := NewGcvPoint2f32Vector(int64(nObjPts))

 	for j := 0; j < nObjPts; j++ {
-		objPtsVec.Set(j, NewGcvPoint3f32(objPts.Col(nil, j)...))
+		objPtsVec.Set(j, NewGcvPoint3f32(mat64.Col(nil, j, objPts)...))
 	}

 	for j := 0; j < nObjPts; j++ {
-		imgPtsVec.Set(j, NewGcvPoint2f32(imgPts.Col(nil, j)...))
+		imgPtsVec.Set(j, NewGcvPoint2f32(mat64.Col(nil, j, imgPts)...))
 	}

 	_camMat := Mat64ToGcvMat(camMat)
--- a/gocv/gocv_calib3d_test.go
+++ b/gocv/gocv_calib3d_test.go
@ -24,7 +24,7 @@ func TestGcvInitCameraMatrix2D(t *testing.T) {
 		-0.226950, 0.942377, -0.899869,
 		-1.148912, 0.093725, 0.634745,
 	})
-	objPts.TCopy(objPts)
+	objPts.Clone(objPts.T())

 	imgPts := mat64.NewDense(10, 2, []float64{
 		-0.384281, -0.299055,
@ -38,15 +38,15 @@ func TestGcvInitCameraMatrix2D(t *testing.T) {
 		0.631444, -0.340257,
 		-0.647580, 0.502113,
 	})
-	imgPts.TCopy(imgPts)
+	imgPts.Clone(imgPts.T())

 	camMat := GcvInitCameraMatrix2D(objPts, imgPts, [2]int{1920, 1080}, 1)
 	assert.InDeltaSlice(t, []float64{1.47219772e+03, 0.00000000e+00, 9.59500000e+02},
-		camMat.Row(nil, 0), DELTA)
+		mat64.Row(nil, 0, camMat), DELTA)
 	assert.InDeltaSlice(t, []float64{0.00000000e+00, 1.47219772e+03, 5.39500000e+02},
-		camMat.Row(nil, 1), DELTA)
+		mat64.Row(nil, 1, camMat), DELTA)
 	assert.InDeltaSlice(t, []float64{0.00000000e+00, 0.00000000e+00, 1.00000000e+00},
-		camMat.Row(nil, 2), DELTA)
+		mat64.Row(nil, 2, camMat), DELTA)
 }

 func TestGcvCalibrateCamera(t *testing.T) {
@ -62,7 +62,7 @@ func TestGcvCalibrateCamera(t *testing.T) {
 		-0.226950, 0.942377, -0.899869,
 		-1.148912, 0.093725, 0.634745,
 	})
-	objPts.TCopy(objPts)
+	objPts.Clone(objPts.T())

 	imgPts := mat64.NewDense(10, 2, []float64{
 		-0.384281, -0.299055,
@ -76,7 +76,7 @@ func TestGcvCalibrateCamera(t *testing.T) {
 		0.631444, -0.340257,
 		-0.647580, 0.502113,
 	})
-	imgPts.TCopy(imgPts)
+	imgPts.Clone(imgPts.T())

 	camMat := GcvInitCameraMatrix2D(objPts, imgPts, [2]int{1920, 1080}, 1)

@ -85,12 +85,12 @@ func TestGcvCalibrateCamera(t *testing.T) {
 	camMat, rvec, tvec := GcvCalibrateCamera(
 		objPts, imgPts, camMat, distCoeffs, [2]int{1920, 1080}, 14575)

-	assert.InDeltaSlice(t, []float64{-46.15296606, 0., 959.5}, camMat.Row(nil, 0), DELTA)
-	assert.InDeltaSlice(t, []float64{0., -46.15296606, 539.5}, camMat.Row(nil, 1), DELTA)
-	assert.InDeltaSlice(t, []float64{0., 0., 1.}, camMat.Row(nil, 2), DELTA)
+	assert.InDeltaSlice(t, []float64{-46.15296606, 0., 959.5}, mat64.Row(nil, 0, camMat), DELTA)
+	assert.InDeltaSlice(t, []float64{0., -46.15296606, 539.5}, mat64.Row(nil, 1, camMat), DELTA)
+	assert.InDeltaSlice(t, []float64{0., 0., 1.}, mat64.Row(nil, 2, camMat), DELTA)

-	assert.InDeltaSlice(t, []float64{-0.98405029, -0.93443411, -0.26304667}, rvec.Col(nil, 0), DELTA)
-	assert.InDeltaSlice(t, []float64{0.6804739, 0.47530207, -0.04833094}, tvec.Col(nil, 0), DELTA)
+	assert.InDeltaSlice(t, []float64{-0.98405029, -0.93443411, -0.26304667}, mat64.Col(nil, 0, rvec), DELTA)
+	assert.InDeltaSlice(t, []float64{0.6804739, 0.47530207, -0.04833094}, mat64.Col(nil, 0, tvec), DELTA)
 }

 func TestGcvRodrigues(t *testing.T) {
@ -101,7 +101,7 @@ func TestGcvRodrigues(t *testing.T) {
 	})
 	rmat := GcvRodrigues(rvec)

-	assert.InDeltaSlice(t, []float64{0.59922526, 0.57799222, -0.55394411}, rmat.Row(nil, 0), DELTA)
-	assert.InDeltaSlice(t, []float64{0.20413818, 0.558743, 0.80382452}, rmat.Row(nil, 1), DELTA)
-	assert.InDeltaSlice(t, []float64{0.77411672, -0.5947531, 0.21682264}, rmat.Row(nil, 2), DELTA)
+	assert.InDeltaSlice(t, []float64{0.59922526, 0.57799222, -0.55394411}, mat64.Row(nil, 0, rmat), DELTA)
+	assert.InDeltaSlice(t, []float64{0.20413818, 0.558743, 0.80382452}, mat64.Row(nil, 1, rmat), DELTA)
+	assert.InDeltaSlice(t, []float64{0.77411672, -0.5947531, 0.21682264}, mat64.Row(nil, 2, rmat), DELTA)
 }
--- a/images/pic5_contours.png
+++ b/images/pic5_contours.png
--- a/opencv/cxcore.go
+++ b/opencv/cxcore.go
@ -142,6 +142,11 @@ func (img *IplImage) Get3D(x, y, z int) Scalar {
 	return Scalar(ret)
 }

+/* Sets every element of an array to a given value. */
+func (img *IplImage) Set(value Scalar) {
+	C.cvSet(unsafe.Pointer(img), (C.CvScalar)(value), nil)
+}
+
 /* Set1D sets a particular element in the image */
 func (img *IplImage) Set1D(x int, value Scalar) {
 	C.cvSet1D(unsafe.Pointer(img), C.int(x), (C.CvScalar)(value))
@ -540,6 +545,25 @@ func (src *IplImage) EqualizeHist(dst *IplImage) {
 /****************************************************************************************\
 *                              Dynamic data structures                        *
 \****************************************************************************************/
+func (seq *Seq) Release() {
+	C.cvReleaseMemStorage(&seq.storage)
+}
+
+func (seq *Seq) Total() int {
+	return (int)(seq.total)
+}
+
+func (seq *Seq) HNext() *Seq {
+	return (*Seq)(seq.h_next)
+}
+
+func (seq *Seq) VNext() *Seq {
+	return (*Seq)(seq.v_next)
+}
+
+func (seq *Seq) Storage() *MemStorage {
+	return (*MemStorage)(seq.storage)
+}

 /****************************************************************************************\
 *                                     Drawing                                 *
--- a/opencv/cxtype.go
+++ b/opencv/cxtype.go
@ -595,6 +595,18 @@ type Box2D struct {
 	angle  float32
 }

+func (box *Box2D) Size() Size2D32f {
+	return box.size
+}
+
+func (box *Box2D) Center() Point2D32f {
+	return box.center
+}
+
+func (box *Box2D) Angle() float32 {
+	return box.angle
+}
+
 type LineIterator C.CvLineIterator

 /************************************* CvSlice ******************************************/
@ -605,6 +617,12 @@ const (
 	CV_WHOLE_SEQ_END_INDEX = C.CV_WHOLE_SEQ_END_INDEX
 )

+/* Equivalent to the C constant CV_WHOLE_SEQ */
+func WholeSeq() Slice {
+	slice := C.cvSlice(C.int(0), C.CV_WHOLE_SEQ_END_INDEX)
+	return (Slice)(slice)
+}
+
 /************************************* CvScalar *****************************************/

 type Scalar C.CvScalar
@ -661,6 +679,18 @@ type Graph C.CvGraph
 type Chain C.CvChain
 type Contour C.CvContour

+const (
+	CV_RETR_EXTERNAL = C.CV_RETR_EXTERNAL
+	CV_RETR_LIST     = C.CV_RETR_LIST
+	CV_RETR_CCOMP    = C.CV_RETR_CCOMP
+	CV_RETR_TREE     = C.CV_RETR_TREE
+
+	CV_CHAIN_APPROX_NONE      = C.CV_CHAIN_APPROX_NONE
+	CV_CHAIN_APPROX_SIMPLE    = C.CV_CHAIN_APPROX_SIMPLE
+	CV_CHAIN_APPROX_TC89_L1   = C.CV_CHAIN_APPROX_TC89_L1
+	CV_CHAIN_APPROX_TC89_KCOS = C.CV_CHAIN_APPROX_TC89_KCOS
+)
+
 /****************************************************************************************\
 *                                    Sequence types                                      *
 \****************************************************************************************/
@ -694,6 +724,15 @@ const (

 type AttrList C.CvAttrList

+/****************************************************************************************/
+/*                  Structural Analysis and Shape Descriptors                           */
+/****************************************************************************************/
+
+/* For use in ApproxPoly */
+const (
+	CV_POLY_APPROX_DP = C.CV_POLY_APPROX_DP
+)
+
 /*****************************************************************************\
 *                                 --- END ---                                 *
 \*****************************************************************************/
--- a/opencv/imgproc.go
+++ b/opencv/imgproc.go
@ -52,3 +52,78 @@ func Crop(src *IplImage, x, y, width, height int) *IplImage {

 	return dest
 }
+
+/* Returns a Seq of countours in an image, detected according to the parameters.
+   Caller must Release() the Seq returned */
+func (image *IplImage) FindContours(mode, method int, offset Point) *Seq {
+	storage := C.cvCreateMemStorage(0)
+	header_size := (C.size_t)(unsafe.Sizeof(C.CvContour{}))
+	var seq *C.CvSeq
+	C.cvFindContours(
+		unsafe.Pointer(image),
+		storage,
+		&seq,
+		C.int(header_size),
+		C.int(mode),
+		C.int(method),
+		C.cvPoint(C.int(offset.X), C.int(offset.Y)))
+
+	return (*Seq)(seq)
+}
+
+//cvDrawContours(CvArr* img, CvSeq* contour, CvScalar externalColor, CvScalar holeColor, int maxLevel, int thickness=1, int lineType=8
+func DrawContours(image *IplImage, contours *Seq, externalColor, holeColor Scalar, maxLevel, thickness, lineType int, offset Point) {
+	C.cvDrawContours(
+		unsafe.Pointer(image),
+		(*C.CvSeq)(contours),
+		(C.CvScalar)(externalColor),
+		(C.CvScalar)(holeColor),
+		C.int(maxLevel),
+		C.int(thickness),
+		C.int(lineType),
+		C.cvPoint(C.int(offset.X), C.int(offset.Y)))
+}
+
+// CvSeq* cvApproxPoly(const void* src_seq, int header_size, CvMemStorage* storage, int method, double eps, int recursive=0 )
+func ApproxPoly(src *Seq, header_size int, storage *MemStorage, method int, eps float64, recursive int) *Seq {
+	seq := C.cvApproxPoly(
+		unsafe.Pointer(src),
+		C.int(header_size),
+		(*C.CvMemStorage)(storage),
+		C.int(method),
+		C.double(eps),
+		C.int(recursive))
+	return (*Seq)(seq)
+}
+
+// cvArcLength(const void* curve, CvSlice slice=CV_WHOLE_SEQ, int is_closed=-1 )
+func ArcLength(curve *Seq, slice Slice, is_closed bool) float64 {
+	is_closed_int := 0
+	if is_closed {
+		is_closed_int = 1
+	}
+	return float64(C.cvArcLength(unsafe.Pointer(curve),
+		(C.CvSlice)(slice),
+		C.int(is_closed_int)))
+}
+
+func ContourPerimeter(curve *Seq) float64 {
+	return ArcLength(curve, WholeSeq(), true)
+}
+
+// double cvContourArea(const CvArr* contour, CvSlice slice=CV_WHOLE_SEQ, int oriented=0 )
+func ContourArea(contour *Seq, slice Slice, oriented int) float64 {
+	return float64(C.cvContourArea(
+		unsafe.Pointer(contour),
+		(C.CvSlice)(slice),
+		C.int(oriented)))
+}
+
+/* points can be either CvSeq* or CvMat* */
+func FitEllipse2(points unsafe.Pointer) Box2D {
+	box := C.cvFitEllipse2(points)
+	center := Point2D32f{float32(box.center.x), float32(box.center.y)}
+	size := Size2D32f{float32(box.size.width), float32(box.size.height)}
+	angle := float32(box.angle)
+	return Box2D{center, size, angle}
+}
--- a/opencv/imgproc_test.go
+++ b/opencv/imgproc_test.go
@ -1,8 +1,10 @@
 package opencv

 import (
+	"os"
 	"path"
 	"runtime"
+	"syscall"
 	"testing"
 )

@ -55,3 +57,56 @@ func TestCrop(t *testing.T) {
 		t.Fatalf("excepted width is 200, returned %d\n", crop.Height())
 	}
 }
+
+func TestFindContours(t *testing.T) {
+	_, currentfile, _, _ := runtime.Caller(0)
+	filename := path.Join(path.Dir(currentfile), "../images/pic5.png")
+
+	image := LoadImage(filename)
+	if image == nil {
+		t.Fatal("LoadImage fail")
+	}
+	defer image.Release()
+
+	grayscale := CreateImage(image.Width(), image.Height(), IPL_DEPTH_8U, 1)
+	CvtColor(image, grayscale, CV_BGR2GRAY)
+	defer grayscale.Release()
+
+	edges := CreateImage(grayscale.Width(), grayscale.Height(), grayscale.Depth(), grayscale.Channels())
+	defer edges.Release()
+	Canny(grayscale, edges, 50, 200, 3)
+
+	seq := edges.FindContours(CV_RETR_EXTERNAL, CV_CHAIN_APPROX_SIMPLE, Point{0, 0})
+	defer seq.Release()
+
+	contours := CreateImage(grayscale.Width(), grayscale.Height(), grayscale.Depth(), grayscale.Channels())
+	white := NewScalar(255, 255, 255, 0)
+	contours.Set(white)
+
+	black := NewScalar(0, 0, 0, 0)
+	red := NewScalar(0, 255, 0, 0)
+
+	for ; seq != nil; seq = seq.HNext() {
+		DrawContours(contours, seq, red, black, 0, 2, 8, Point{0, 0})
+	}
+
+	filename = path.Join(path.Dir(currentfile), "../images/pic5_contours.png")
+	// Uncomment this code to create the test image "../images/shapes_contours.png"
+	// It is part of the repo, and what this test compares against
+	//
+	//SaveImage(filename), contours, 0)
+
+	tempfilename := path.Join(os.TempDir(), "pic5_contours.png")
+	defer syscall.Unlink(tempfilename)
+	SaveImage(tempfilename, contours, 0)
+
+	// Compare actual image with expected image
+	same, err := BinaryCompare(filename, tempfilename)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !same {
+		t.Error("Expected contour file != actual contour file")
+	}
+
+}
--- a/samples/webcam_facedetect.go
+++ b/samples/webcam_facedetect.go
@ -0,0 +1,54 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"path"
+
+	"github.com/lazywei/go-opencv/opencv"
+)
+
+func main() {
+	win := opencv.NewWindow("Go-OpenCV Webcam Face Detection")
+	defer win.Destroy()
+
+	cap := opencv.NewCameraCapture(0)
+	if cap == nil {
+		panic("cannot open camera")
+	}
+	defer cap.Release()
+
+	cwd, err := os.Getwd()
+	if err != nil {
+		panic(err)
+	}
+	cascade := opencv.LoadHaarClassifierCascade(path.Join(cwd, "haarcascade_frontalface_alt.xml"))
+
+	fmt.Println("Press ESC to quit")
+	for {
+		if cap.GrabFrame() {
+			img := cap.RetrieveFrame(1)
+			if img != nil {
+				faces := cascade.DetectObjects(img)
+				for _, value := range faces {
+					opencv.Circle(img,
+						opencv.Point{
+							value.X() + (value.Width() / 2),
+							value.Y() + (value.Height() / 2),
+						},
+						value.Width()/2,
+						opencv.ScalarAll(255.0), 1, 1, 0)
+				}
+
+				win.ShowImage(img)
+			} else {
+				fmt.Println("nil image")
+			}
+		}
+		key := opencv.WaitKey(1)
+
+		if key == 27 {
+			os.Exit(0)
+		}
+	}
+}
Author	SHA1	Message	Date
Chih-Wei (Bert) Chang	1d8dd6c04e	Merge pull request #65 from deltamobile/updated_gonum_matrix Updated gonum matrix	2016-01-27 00:08:56 +08:00
James Graves	85bef28375	Remove erroneous ColView() calls. Commit `9360634c0c` inserted calls to ColView() when not needed, causing out-of-bounds errors. This fixes the unit tests.	2016-01-26 10:00:06 -06:00
James Graves	eb896f771a	Fixed usage of TCopy() and Row() Col(). API for gonum/matrix has changed. TCopy() has been removed, use Clone() after T(). Row() and Col() are no longer methods of dense matrix, but regular module functions now.	2016-01-26 09:56:45 -06:00
Chih-Wei (Bert) Chang	63c522d448	Merge pull request #63 from 9nut/master Added a sample for face detection on video from webcam	2016-01-17 09:36:11 +08:00
Skip Tavakkolian	033205d5e7	Added a sample for face detection on video from builtin camera	2016-01-07 10:59:43 -08:00
Chih-Wei (Bert) Chang	60747d253e	Merge pull request #61 from hpgood/patch-1 update the api of "github.com/gonum/matrix/mat64"	2015-11-06 21:47:26 +08:00
hpgood	9360634c0c	update the api of "github.com/gonum/matrix/mat64" *mat64.Dense has removed the "Col" function.	2015-11-03 13:34:14 +08:00
Chih-Wei (Bert) Chang	08a8c82102	Merge pull request #56 from davidoram/feature/sequence-traversal Feature/sequence traversal	2015-09-19 08:29:16 +08:00
David Oram	857725be79	Added sequence, curve and contour related functions	2015-09-14 17:21:21 +12:00
David Oram	17d76c68f9	Merge branch 'master' of https://github.com/lazywei/go-opencv	2015-09-11 06:19:43 +12:00
Chih-Wei (Bert) Chang	b115d87f0d	Merge pull request #55 from davidoram/feature/fix-eqialize-hist Feature/fix eqialize hist	2015-09-10 19:19:18 +08:00
David Oram	895f618849	removed unused pic	2015-09-10 17:29:16 +12:00
David Oram	2417f71bcb	Removed duplicate EqualizeHist function	2015-09-10 17:27:25 +12:00
Chih-Wei (Bert) Chang	73ab0e8b58	Merge pull request #54 from davidoram/feature/contours Feature/contours	2015-09-10 13:01:15 +08:00
David Oram	f812503e45	Refactored FindCountours to pass all parameters needed	2015-09-10 16:56:27 +12:00
David Oram	02da2d4700	Added functions: - FindContours - DrawContours - Set - EqualizeHist and associated constants	2015-09-10 16:51:38 +12:00
Chih-Wei (Bert) Chang	d59c967c2c	Merge pull request #53 from davidoram/feature/average Feature/average	2015-09-05 11:32:39 +08:00
David Oram	8f000e16ff	Created basic functionality	2015-09-01 06:29:03 +12:00