From f510f71b4e1375e29bd05c16687848a649202a76 Mon Sep 17 00:00:00 2001
From: Peter Braden <peterbraden@peterbraden.co.uk>
Date: Fri, 27 Jan 2012 11:08:41 -0800
Subject: [PATCH] improve interface

---
 README.md     | 4 ++--
 lib/opencv.js | 4 ++--
 smoketest.js  | 2 +-
 test/smoke.js | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 90bfdb3..bb2ee87 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Or to build the repo:
 
 
         cv.readImage("./examples/test.jpg", function(err, im){
-          im.faceDetect("./examples/haarcascade_frontalface_alt.xml", {}, function(err, faces){  
+          im.detectObject("./examples/haarcascade_frontalface_alt.xml", {}, function(err, faces){  
             for (var i=0;i<faces.length; i++){
               var x = faces[i]
               im.ellipse(x.x + x.width/2, x.y + x.height/2, x.width/2, x.height/2);
@@ -82,7 +82,7 @@ There is a shortcut method for
 detection. This can be used for face detection etc.
 
 
-
+        mat.detectObject(haar_cascade_xml, opts, function(err, matches){})
 
 
 
diff --git a/lib/opencv.js b/lib/opencv.js
index c25f6da..6794e41 100644
--- a/lib/opencv.js
+++ b/lib/opencv.js
@@ -17,8 +17,8 @@ The matrix is one of opencv's most core datatypes.
 
 var matrix = cv.Matrix.prototype;
 
-matrix.faceDetect = function(classifier, opts, cb){
-	var face_cascade = new cv.CascadeClassifier("./examples/haarcascade_frontalface_alt.xml");
+matrix.detectObject = function(classifier, opts, cb){
+	var face_cascade = new cv.CascadeClassifier(classifier);
 	face_cascade.detectMultiScale(this, cb);
 }
 
diff --git a/smoketest.js b/smoketest.js
index 8d6a8a1..7cbdfc3 100755
--- a/smoketest.js
+++ b/smoketest.js
@@ -6,7 +6,7 @@ var cv = require('./lib/opencv')
  
 
  cv.readImage("./examples/mona.jpg", function(err, im){
-  im.faceDetect("./examples/haarcascade_frontalface_alt.xml", {}, function(err, faces){  
+  im.detectObject("./examples/haarcascade_frontalface_alt.xml", {}, function(err, faces){  
     for (var i=0;i<faces.length; i++){
       var x = faces[i]
       im.ellipse(x.x + x.width/2, x.y + x.height/2, x.width/2, x.height/2);
diff --git a/test/smoke.js b/test/smoke.js
index 12c4247..6c9f6d1 100644
--- a/test/smoke.js
+++ b/test/smoke.js
@@ -121,14 +121,14 @@ vows.describe('Smoke Tests OpenCV').addBatch({
 
     }
 
-    , "faceDetect": {
+    , "detectObject": {
       
      topic : function(){
         var cv = require('../lib/opencv')
           , cb = this.callback
 
         cv.readImage("./examples/mona.jpg", function(err, im){
-          im.faceDetect("./examples/haarcascade_frontalface_alt.xml", {}, cb)
+          im.detectObject("./examples/haarcascade_frontalface_alt.xml", {}, cb)
         })  
       }