Skip to content

Commit e981138

Browse files
committed
v.1.0.2
* port some code from latest opencv
1 parent f8e3b69 commit e981138

File tree

6 files changed

+378
-387
lines changed

6 files changed

+378
-387
lines changed

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ __Feature Detection Library for JavaScript__ (uses HTML5 canvas on browser an
88
Based on [Viola-Jones Feature Detection Algorithm using Haar Cascades](http://www.cs.cmu.edu/~efros/courses/LBMV07/Papers/viola-cvpr-01.pdf)
99
and improvement [Viola-Jones-Lienhart et al Feature Detection Algorithm](http://www.multimedia-computing.de/mediawiki//images/5/52/MRL-TR-May02-revised-Dec02.pdf)
1010

11-
This is a port of [OpenCV C++ Haar Detection](http://opencv.org/) (actually a port of [JViolaJones](http://code.google.com/p/jviolajones/) which is a port of OpenCV for Java) to JavaScript and Node
11+
This is a port of [OpenCV C++ Haar Detection](https://github.com/opencv/opencv) and of [JViolaJones Java](http://code.google.com/p/jviolajones/)) to JavaScript.
1212

1313

1414
**there is also a [`php` version: HAARPHP](https://github.com/foo123/HAARPHP)**

api-reference.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ detector.image(ImageOrVideoOrCanvas, scale, CanvasClass);
6969
__Explanation of parameters__
7070

7171
* _ImageOrVideoOrCanvas_ : an actual Image or Video element or Canvas Object (in this case they are equivalent).
72-
* _scale_ : The percent of scaling from the original image, so detection proceeds faster on a smaller image (default __0.5__ ). __NOTE__ scaling might alter the detection results sometimes, if having problems opt towards 1 (slower)
72+
* _scale_ : The percent of scaling from the original image, so detection proceeds faster on a smaller image (default __1.0__ ). __NOTE__ scaling might alter the detection results sometimes, if having problems opt towards 1 (slower)
7373
* _CanvasClass_ : This is optional and used only when running in node (passing the node-canvas object).
7474

7575

@@ -90,8 +90,8 @@ __cannyThreshold({low: lowThreshold, high: highThreshold})__
9090
detector.cannyThreshold({low: lowThreshold, high: highThreshold});
9191
```
9292

93-
Set the thresholds when Canny Pruning is used, for extra fine-tuning.
94-
Canny Pruning detects the number/density of edges in a given region. A region with too few or too many edges is unlikely to be a feature.
93+
Set the thresholds when Canny Pruning is used, for extra fine-tuning.
94+
Canny Pruning detects the number/density of edges in a given region. A region with too few or too many edges is unlikely to be a feature.
9595
Default values work fine in most cases, however depending on image size and the specific feature, some fine tuning could be needed
9696

9797
__Explanation of parameters__
@@ -132,9 +132,9 @@ __Explanation of parameters__
132132

133133

134134

135-
__detect(baseScale, scale_inc, increment, min_neighbors, doCannyPruning)__
135+
__detect(baseScale, scale_inc, increment, min_neighbors, epsilon, doCannyPruning)__
136136
```javascript
137-
detector.detect(baseScale, scale_inc, increment, min_neighbors, doCannyPruning);
137+
detector.detect(baseScale, scale_inc, increment, min_neighbors, epsilon, doCannyPruning);
138138
```
139139

140140
__Explanation of parameters__ ([JViolaJones Parameters](http://code.google.com/p/jviolajones/wiki/Parameters))
@@ -143,7 +143,8 @@ __Explanation of parameters__ ([JViolaJones Parameters](http://code.google.com/p
143143
* *scale_inc* : The scale increment of the window size, at each step (default __1.25__ ).
144144
* *increment* : The shift of the window at each sub-step, in terms of percentage of the window size (default __0.5__ ).
145145
* *min_neighbors* : The minimum numbers of similar rectangles needed for the region to be considered as a feature (avoid noise) (default __1__ )
146-
* *doCannyPruning* : enable Canny Pruning to pre-detect regions unlikely to contain features, in order to speed up the execution (optional default __true__ ).
146+
* *epsilon* : Epsilon value that determines similarity between detected rectangles. `0` means identical (default __0.2__ )
147+
* *doCannyPruning* : enable Canny Pruning to pre-detect regions unlikely to contain features, in order to speed up the execution (optional default __false__ ).
147148

148149

149150

beeld.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ tasks =[{}]
4242

4343
"@@ROOT@@" = "'undefined' !== typeof self ? self : this"
4444
"@@MODULE@@" = "HAAR"
45-
"@@VERSION@@" = "1.0.0"
45+
"@@VERSION@@" = "1.0.2"
4646

4747
@
4848

build/haar-detector.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

changelog.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
### ChangeLog
22

3+
__1.0.2__
4+
* port code from latest version of opencv
5+
36
__1.0.0__
47
* backport from FILTER.js HAARDetector plugin correct handling of detecting with selection
5-
* release final version 1.0.0
8+
* release version 1.0.0
69

710
__0.4.8__
811
* fix undeclared variable issue in *detectSingleStep* method

0 commit comments

Comments
 (0)