OrgGo
/
hybridgroup.gobot
mirror of https://github.com/hybridgroup/gobot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use OpenCV 2.4, as well as switch to main fork of go-opencv

This commit is contained in:
deadprogram 2016-02-19 18:36:33 -08:00
parent d7b2a33dc0
commit f55cd94cd5
9 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/opencv_face_detect.go
View File

@ -5,7 +5,7 @@ import (
"runtime"
"time"
cv "github.com/hybridgroup/go-opencv/opencv"
cv "github.com/lazywei/go-opencv/opencv"
"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/platforms/opencv"
)

2
examples/opencv_window.go
View File

@ -1,7 +1,7 @@
package main
import (
cv "github.com/hybridgroup/go-opencv/opencv"
cv "github.com/lazywei/go-opencv/opencv"
"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/platforms/opencv"
)

14
platforms/opencv/README.md
View File

@ -6,11 +6,11 @@ For more info about OpenCV click [here](http://opencv.org/)
## How to Install
This package requires `opencv` to be installed on your system
This package requires OpenCV version 2.4 to be installed on your system. Please note that it is not compatible with OpenCV 3.x at this time.
### OSX
To install `opencv` on OSX using Homebrew:
To install OpenCV on OSX using Homebrew:
```
$ brew tap homebrew/science && brew install opencv
@ -18,7 +18,13 @@ $ brew tap homebrew/science && brew install opencv
### Ubuntu
Follow the official [OpenCV installation guide](http://docs.opencv.org/doc/tutorials/introduction/linux_install/linux_install.html)
To install OpenCV on Ubuntu 14.04:
```
$ sudo apt-get install libopencv-dev
```
Or, follow the official [OpenCV installation guide](http://docs.opencv.org/doc/tutorials/introduction/linux_install/linux_install.html)
### Windows
@ -38,7 +44,7 @@ Example using the camera.
package main
import (
cv "github.com/hybridgroup/go-opencv/opencv"
cv "github.com/lazywei/go-opencv/opencv"
"github.com/hybridgroup/gobot"
"github.com/hybridgroup/gobot/platforms/opencv"
)

2
platforms/opencv/camera_driver.go
View File

@ -5,7 +5,7 @@ import (
"time"
cv "github.com/hybridgroup/go-opencv/opencv"
cv "github.com/lazywei/go-opencv/opencv"
"github.com/hybridgroup/gobot"
)

2
platforms/opencv/helpers_test.go
View File

@ -1,6 +1,6 @@
package opencv
import cv "github.com/hybridgroup/go-opencv/opencv"
import cv "github.com/lazywei/go-opencv/opencv"
type testCapture struct{}

4
platforms/opencv/utils.go
View File

@ -1,7 +1,7 @@
package opencv
import (
cv "github.com/hybridgroup/go-opencv/opencv"
cv "github.com/lazywei/go-opencv/opencv"
)
// loadHaarClassifierCascade returns open cv HaarCascade loaded
@ -20,7 +20,7 @@ func DrawRectangles(image *cv.IplImage, rect []*cv.Rect, r int, g int, b int, th
cv.Rectangle(image,
cv.Point{value.X() + value.Width(), value.Y()},
cv.Point{value.X(), value.Y() + value.Height()},
cv.NewScalar(b, g, r), thickness, 1, 0)
cv.NewScalar(float64(b), float64(g), float64(r), 0), thickness, 1, 0)
}
return image
}

2
platforms/opencv/utils_test.go
View File

@ -5,7 +5,7 @@ import (
"runtime"
"testing"
cv "github.com/hybridgroup/go-opencv/opencv"
cv "github.com/lazywei/go-opencv/opencv"
"github.com/hybridgroup/gobot"
)

2
platforms/opencv/window_driver.go
View File

@ -1,7 +1,7 @@
package opencv
import (
cv "github.com/hybridgroup/go-opencv/opencv"
cv "github.com/lazywei/go-opencv/opencv"
"github.com/hybridgroup/gobot"
)

2
platforms/opencv/window_driver_test.go
View File

@ -5,7 +5,7 @@ import (
"runtime"
"testing"
cv "github.com/hybridgroup/go-opencv/opencv"
cv "github.com/lazywei/go-opencv/opencv"
"github.com/hybridgroup/gobot"
)