v.1.0.4

* fix regression error

Author: foo123

build/haar-detector.js

@@ -349,9 +349,10 @@ function groupRectangles(rects, min_neighbors, epsilon)
     {
         for (j=i+1; j<rlen; ++j)
         {
-            if ((!feats[i].isInside && feats[i].inside(feats[j]))
-            || (!feats[j].isInside && feats[j].inside(feats[i])))
+            if (!feats[i].isInside && feats[i].inside(feats[j], epsilon))
                 feats[i].isInside = true;
+            if (!feats[j].isInside && feats[j].inside(feats[i], epsilon))
+                feats[j].isInside = true;
         }
     }
     i = rlen;

build/haar-detector.min.js

@@ -83,7 +83,7 @@ <h1>Eye Detection with eye haar cascade by Mar Canet in JavaScript</h1>
                         log('Selection Rectangle: ');
                         log(this.Selection.toString());
                         log('Detected Features (' + l +') :');
-                        log(this.objects.toString());
+                        log(JSON.stringify(this.objects));
                         alert(l+" Objects found");
                     })
                     .cannyThreshold({low:5, high:200})  // custom thresholds for canny pruning (for best results)

examples/eye.html

@@ -76,7 +76,7 @@ <h1>Face Detection with OpenCV haar cascades in JavaScript</h1>
                         log('Selection Rectangle: ');
                         log(this.Selection.toString());
                         log('Detected Features (' + l +') :');
-                        log(this.objects.toString());
+                        log(JSON.stringify(this.objects));
                         alert(l+" Objects found");
                     })
                     .detect(1, 1.1, 0.12, 1, 0.2, true); // go

examples/face.html

@@ -79,11 +79,11 @@ <h1>Many Faces Detection with OpenCV haar cascades in JavaScript</h1>
                         log('Selection Rectangle: ');
                         log(this.Selection.toString());
                         log('Detected Features (' + l +') :');
-                        log(this.objects.toString());
+                        log(JSON.stringify(this.objects));
                         alert(l+" Objects found");
                     })
-                    .cannyThreshold({low:20, high:400})  // custom thresholds for canny pruning (for best results)
-                    .detect(1, 1.1, 0.12, 1, 0.2, true); // go
+                    .cannyThreshold({low:20, high:600})  // custom thresholds for canny pruning (for best results)
+                    .detect(1, 1.1, 0.1, 1, 0.2, true); // go
         };
         image.src='Group_Faces2.jpg'; // load it
         //]]>

examples/faces.html

@@ -76,7 +76,7 @@ <h1>Mouth Detection with OpenCV haar cascades in JavaScript</h1>
                         log('Selection Rectangle: ');
                         log(this.Selection.toString());
                         log('Detected Features (' + l +') :');
-                        log(this.objects.toString());
+                        log(JSON.stringify(this.objects));
                         alert(l+" Objects found");
                     })
                     .cannyThreshold({low:50, high:110})  // custom thresholds for canny pruning (for best results)

examples/mouth.html

@@ -325,9 +325,10 @@ function groupRectangles(rects, min_neighbors, epsilon)
     {
         for (j=i+1; j<rlen; ++j)
         {
-            if ((!feats[i].isInside && feats[i].inside(feats[j]))
-            || (!feats[j].isInside && feats[j].inside(feats[i])))
+            if (!feats[i].isInside && feats[i].inside(feats[j], epsilon))
                 feats[i].isInside = true;
+            if (!feats[j].isInside && feats[j].inside(feats[i], epsilon))
+                feats[j].isInside = true;
         }
     }
     i = rlen;