From b082d6739a6d75dd96792dd52997a42a9cd2b2e4 Mon Sep 17 00:00:00 2001 From: Ron Evans Date: Tue, 24 Apr 2018 12:56:26 +0200 Subject: [PATCH 1/2] opencv: update to latest version of GoCV Signed-off-by: Ron Evans --- Gopkg.lock | 6 +++--- Gopkg.toml | 2 +- platforms/opencv/camera_driver.go | 4 ++-- platforms/opencv/helpers_test.go | 2 +- platforms/opencv/utils.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 1f537b953..d9044375e 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -166,8 +166,8 @@ [[projects]] name = "gocv.io/x/gocv" packages = ["."] - revision = "65d6ebdd323af342cc48ac0d146ef7ad16b33fbc" - version = "v0.9.0" + revision = "ab6d932219faf43e531eea89ef3496cdb67aa734" + version = "0.11.0" [[projects]] branch = "master" @@ -209,6 +209,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "ce3deb9e4c499f6262bf532372e9f8fec873daa6ddb9c19d2a0ecc55d2c50da4" + inputs-digest = "c43dc994a8c7f2d4c032139478a57e90a174738d54033e5076e9705e13352dda" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 98d3ee815..62549bedf 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -75,7 +75,7 @@ [[constraint]] name = "gocv.io/x/gocv" - version = "0.9.0" + version = "0.11.0" [[constraint]] branch = "master" diff --git a/platforms/opencv/camera_driver.go b/platforms/opencv/camera_driver.go index f229bd023..3a7f8b11a 100644 --- a/platforms/opencv/camera_driver.go +++ b/platforms/opencv/camera_driver.go @@ -8,7 +8,7 @@ import ( ) type capture interface { - Read(img gocv.Mat) bool + Read(img *gocv.Mat) bool } const ( @@ -67,7 +67,7 @@ func (c *CameraDriver) Start() (err error) { img := gocv.NewMat() go func() { for { - if ok := c.camera.Read(img); ok { + if ok := c.camera.Read(&img); ok { c.Publish(Frame, img) } } diff --git a/platforms/opencv/helpers_test.go b/platforms/opencv/helpers_test.go index a0e9d311d..b8c7d63f2 100644 --- a/platforms/opencv/helpers_test.go +++ b/platforms/opencv/helpers_test.go @@ -6,7 +6,7 @@ import ( type testCapture struct{} -func (c *testCapture) Read(img gocv.Mat) bool { +func (c *testCapture) Read(img *gocv.Mat) bool { return true } diff --git a/platforms/opencv/utils.go b/platforms/opencv/utils.go index d91e6b5c9..7e2641a19 100644 --- a/platforms/opencv/utils.go +++ b/platforms/opencv/utils.go @@ -29,7 +29,7 @@ func DetectObjects(haar string, img gocv.Mat) []image.Rectangle { // DrawRectangles uses Rect array values to return image with rectangles drawn. func DrawRectangles(img gocv.Mat, rects []image.Rectangle, r int, g int, b int, thickness int) { for _, rect := range rects { - gocv.Rectangle(img, rect, color.RGBA{uint8(r), uint8(g), uint8(b), 0}, thickness) + gocv.Rectangle(&img, rect, color.RGBA{uint8(r), uint8(g), uint8(b), 0}, thickness) } return } From b2ddfe7895c4e414cd4e6a6734b31b12ea68ed8e Mon Sep 17 00:00:00 2001 From: Ron Evans Date: Tue, 24 Apr 2018 13:03:49 +0200 Subject: [PATCH 2/2] release: update version to 1.10.2 Signed-off-by: Ron Evans --- CHANGELOG.md | 5 +++++ version.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74737ea16..f014ab9e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +1.10.2 +--- +* **opencv** + * update GoCV to latest version + 1.10.1 --- * **tello** diff --git a/version.go b/version.go index af0982650..df67fc905 100644 --- a/version.go +++ b/version.go @@ -1,6 +1,6 @@ package gobot -const version = "1.10.1" +const version = "1.10.2" // Version returns the current Gobot version func Version() string {