opencv: update interface and examples to indicate multipurpose

Signed-off-by: deadprogram <[email protected]>
hu19891110 · Oct 23, 2017 · 5e2ea8c · 5e2ea8c
1 parent f37af5c
commit 5e2ea8c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/examples/ardrone_face_tracking.go b/examples/ardrone_face_tracking.go
@@ -46,7 +46,7 @@ func main() {
 				gobot.Every(300*time.Millisecond, func() {
 					drone.Hover()
 					i := img
-					faces := opencv.DetectFaces(cascade, i)
+					faces := opencv.DetectObjects(cascade, i)
 					biggest := 0
 					var face image.Rectangle
 					for _, f := range faces {

diff --git a/examples/opencv_face_detect.go b/examples/opencv_face_detect.go
@@ -38,7 +38,7 @@ func main() {
 			if i.Empty() {
 				return
 			}
-			faces := opencv.DetectFaces(cascade, i)
+			faces := opencv.DetectObjects(cascade, i)
 			opencv.DrawRectangles(i, faces, 0, 255, 0, 5)
 			window.ShowImage(i)
 			window.WaitKey(1)

diff --git a/platforms/opencv/utils.go b/platforms/opencv/utils.go
@@ -21,8 +21,8 @@ func loadCascadeClassifier(haar string) *gocv.CascadeClassifier {
 	return classifier
 }
 
-// DetectFaces loads Haar cascade to detect face objects in image
-func DetectFaces(haar string, img gocv.Mat) []image.Rectangle {
+// DetectObjects loads Haar cascade to detect face objects in image
+func DetectObjects(haar string, img gocv.Mat) []image.Rectangle {
 	return loadCascadeClassifier(haar).DetectMultiScale(img)
 }
 

diff --git a/platforms/opencv/utils_test.go b/platforms/opencv/utils_test.go
@@ -12,7 +12,7 @@ import (
 func TestUtils(t *testing.T) {
 	_, currentfile, _, _ := runtime.Caller(0)
 	image := gocv.IMRead(path.Join(path.Dir(currentfile), "lena-256x256.jpg"), gocv.IMReadColor)
-	rect := DetectFaces("haarcascade_frontalface_alt.xml", image)
+	rect := DetectObjects("haarcascade_frontalface_alt.xml", image)
 	gobottest.Refute(t, len(rect), 0)
 	DrawRectangles(image, rect, 0, 0, 0, 0)
 }