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

coolhacks · Feb 20, 2016 · f55cd94 · f55cd94
1 parent d7b2a33
commit f55cd94
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 13 deletions.
diff --git a/examples/opencv_face_detect.go b/examples/opencv_face_detect.go
@@ -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"
 )

diff --git a/examples/opencv_window.go b/examples/opencv_window.go
@@ -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"
 )

diff --git a/platforms/opencv/README.md b/platforms/opencv/README.md
@@ -6,19 +6,25 @@ 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
 ```
 
 ### 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"
 )

diff --git a/platforms/opencv/camera_driver.go b/platforms/opencv/camera_driver.go
@@ -5,7 +5,7 @@ import (
 
 	"time"
 
-	cv "github.com/hybridgroup/go-opencv/opencv"
+	cv "github.com/lazywei/go-opencv/opencv"
 	"github.com/hybridgroup/gobot"
 )
 

diff --git a/platforms/opencv/helpers_test.go b/platforms/opencv/helpers_test.go
@@ -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{}
 

diff --git a/platforms/opencv/utils.go b/platforms/opencv/utils.go
@@ -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
 }
diff --git a/platforms/opencv/utils_test.go b/platforms/opencv/utils_test.go
@@ -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"
 )
 

diff --git a/platforms/opencv/window_driver.go b/platforms/opencv/window_driver.go
@@ -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"
 )
 

diff --git a/platforms/opencv/window_driver_test.go b/platforms/opencv/window_driver_test.go
@@ -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"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"time"
-    	cv "github.com/hybridgroup/go-opencv/opencv"
+    	cv "github.com/lazywei/go-opencv/opencv"
     	"github.com/hybridgroup/gobot"
     )
@@ Expand Down @@