Skip to content

Commit 333136b

Browse files
committed
v.1.0.3
* fix haartojs xml conversion script * nodejs example with CanvasLite * validate all examples/tests
1 parent 28fcb19 commit 333136b

14 files changed

+15583
-15563
lines changed

Readme.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
**Note:** Further development has moved to the [FILTER.js](https://github.com/foo123/FILTER.js) project, for Image Processing and Computer Vision, which includes a new [**HaarDetector plugin**](https://github.com/foo123/FILTER.js/blob/master/src/plugins/HaarDetector.js) which can be seen as the continuation of this project.
44

55

6-
__Feature Detection Library for JavaScript__ (uses HTML5 canvas on browser and Canvas package on Node)
6+
__Feature Detection Library for JavaScript__ (uses HTML5 canvas on browser and canvas alternative on Node)
77

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)
@@ -14,37 +14,13 @@ This is a port of [OpenCV C++ Haar Detection](https://github.com/opencv/opencv)
1414
**there is also a [`php` version: HAARPHP](https://github.com/foo123/HAARPHP)**
1515

1616

17-
Light-weight (~10kB minified, ~5kB gzipped).
17+
Light-weight (~11kB minified, ~5kB gzipped).
1818

1919
[![Haar.js Face Detection](/examples/haar-face-detection.png)](https://foo123.github.io/examples/face-detection/)
2020
[![Haar.js Many Faces Detection](/examples/haar-faces-detection.png)](https://foo123.github.io/examples/faces-detection/)
2121
[![Haar.js Mouth Detection](/examples/haar-mouth-detection.png)](https://foo123.github.io/examples/mouth-detection/)
2222
![Haar.js Eyes Detection](/examples/haar-eyes-detection.png)
2323

24-
**see also:**
25-
26-
* [Abacus](https://github.com/foo123/Abacus) advanced Combinatorics and Algebraic Number Theory Symbolic Computation library for JavaScript, Python
27-
* [MOD3](https://github.com/foo123/MOD3) 3D Modifier Library in JavaScript
28-
* [Geometrize](https://github.com/foo123/Geometrize) Computational Geometry and Rendering Library for JavaScript
29-
* [Plot.js](https://github.com/foo123/Plot.js) simple and small library which can plot graphs of functions and various simple charts and can render to Canvas, SVG and plain HTML
30-
* [HAAR.js](https://github.com/foo123/HAAR.js) image feature detection based on Haar Cascades in JavaScript (Viola-Jones-Lienhart et al Algorithm)
31-
* [HAARPHP](https://github.com/foo123/HAARPHP) image feature detection based on Haar Cascades in PHP (Viola-Jones-Lienhart et al Algorithm)
32-
* [FILTER.js](https://github.com/foo123/FILTER.js) video and image processing and computer vision Library in pure JavaScript (browser and node)
33-
* [Xpresion](https://github.com/foo123/Xpresion) a simple and flexible eXpression parser engine (with custom functions and variables support), based on [GrammarTemplate](https://github.com/foo123/GrammarTemplate), for PHP, JavaScript, Python
34-
* [Regex Analyzer/Composer](https://github.com/foo123/RegexAnalyzer) Regular Expression Analyzer and Composer for PHP, JavaScript, Python
35-
* [GrammarTemplate](https://github.com/foo123/GrammarTemplate) grammar-based templating for PHP, JavaScript, Python
36-
* [codemirror-grammar](https://github.com/foo123/codemirror-grammar) transform a formal grammar in JSON format into a syntax-highlight parser for CodeMirror editor
37-
* [ace-grammar](https://github.com/foo123/ace-grammar) transform a formal grammar in JSON format into a syntax-highlight parser for ACE editor
38-
* [prism-grammar](https://github.com/foo123/prism-grammar) transform a formal grammar in JSON format into a syntax-highlighter for Prism code highlighter
39-
* [highlightjs-grammar](https://github.com/foo123/highlightjs-grammar) transform a formal grammar in JSON format into a syntax-highlight mode for Highlight.js code highlighter
40-
* [syntaxhighlighter-grammar](https://github.com/foo123/syntaxhighlighter-grammar) transform a formal grammar in JSON format to a highlight brush for SyntaxHighlighter code highlighter
41-
* [SortingAlgorithms](https://github.com/foo123/SortingAlgorithms) implementations of Sorting Algorithms in JavaScript
42-
* [PatternMatchingAlgorithms](https://github.com/foo123/PatternMatchingAlgorithms) implementations of Pattern Matching Algorithms in JavaScript
43-
* [CanvasLite](https://github.com/foo123/CanvasLite) an html canvas implementation in pure JavaScript
44-
* [Rasterizer](https://github.com/foo123/Rasterizer) stroke and fill lines, rectangles, curves and paths, without canvaσ
45-
* [Gradient](https://github.com/foo123/Gradient) create linear, radial, conic and elliptic gradients and image patterns without canvas
46-
* [css-color](https://github.com/foo123/css-color) simple class to parse and manipulate colors in various formats
47-
4824

4925
### Contents
5026

@@ -159,3 +135,27 @@ In most cases using parallel computation (if supported) can be much faster (eg _
159135
- [x] add selection option, detection is confined to that selection (eg detect nose while face already detected) [DONE]
160136
- [x] check if some operations can use fixed-point arithmetic, or other micro-optimizations [DONE where applicable]
161137
- [ ] keep up with the changes in openCV cascades xml format (will try)
138+
139+
**see also:**
140+
141+
* [Abacus](https://github.com/foo123/Abacus) advanced Combinatorics and Algebraic Number Theory Symbolic Computation library for JavaScript, Python
142+
* [MOD3](https://github.com/foo123/MOD3) 3D Modifier Library in JavaScript
143+
* [Geometrize](https://github.com/foo123/Geometrize) Computational Geometry and Rendering Library for JavaScript
144+
* [Plot.js](https://github.com/foo123/Plot.js) simple and small library which can plot graphs of functions and various simple charts and can render to Canvas, SVG and plain HTML
145+
* [HAAR.js](https://github.com/foo123/HAAR.js) image feature detection based on Haar Cascades in JavaScript (Viola-Jones-Lienhart et al Algorithm)
146+
* [HAARPHP](https://github.com/foo123/HAARPHP) image feature detection based on Haar Cascades in PHP (Viola-Jones-Lienhart et al Algorithm)
147+
* [FILTER.js](https://github.com/foo123/FILTER.js) video and image processing and computer vision Library in pure JavaScript (browser and node)
148+
* [Xpresion](https://github.com/foo123/Xpresion) a simple and flexible eXpression parser engine (with custom functions and variables support), based on [GrammarTemplate](https://github.com/foo123/GrammarTemplate), for PHP, JavaScript, Python
149+
* [Regex Analyzer/Composer](https://github.com/foo123/RegexAnalyzer) Regular Expression Analyzer and Composer for PHP, JavaScript, Python
150+
* [GrammarTemplate](https://github.com/foo123/GrammarTemplate) grammar-based templating for PHP, JavaScript, Python
151+
* [codemirror-grammar](https://github.com/foo123/codemirror-grammar) transform a formal grammar in JSON format into a syntax-highlight parser for CodeMirror editor
152+
* [ace-grammar](https://github.com/foo123/ace-grammar) transform a formal grammar in JSON format into a syntax-highlight parser for ACE editor
153+
* [prism-grammar](https://github.com/foo123/prism-grammar) transform a formal grammar in JSON format into a syntax-highlighter for Prism code highlighter
154+
* [highlightjs-grammar](https://github.com/foo123/highlightjs-grammar) transform a formal grammar in JSON format into a syntax-highlight mode for Highlight.js code highlighter
155+
* [syntaxhighlighter-grammar](https://github.com/foo123/syntaxhighlighter-grammar) transform a formal grammar in JSON format to a highlight brush for SyntaxHighlighter code highlighter
156+
* [SortingAlgorithms](https://github.com/foo123/SortingAlgorithms) implementations of Sorting Algorithms in JavaScript
157+
* [PatternMatchingAlgorithms](https://github.com/foo123/PatternMatchingAlgorithms) implementations of Pattern Matching Algorithms in JavaScript
158+
* [CanvasLite](https://github.com/foo123/CanvasLite) an html canvas implementation in pure JavaScript
159+
* [Rasterizer](https://github.com/foo123/Rasterizer) stroke and fill lines, rectangles, curves and paths, without canvaσ
160+
* [Gradient](https://github.com/foo123/Gradient) create linear, radial, conic and elliptic gradients and image patterns without canvas
161+
* [css-color](https://github.com/foo123/css-color) simple class to parse and manipulate colors in various formats

api-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ __Explanation of parameters__
7070

7171
* _ImageOrVideoOrCanvas_ : an actual Image or Video element or Canvas Object (in this case they are equivalent).
7272
* _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)
73-
* _CanvasClass_ : This is optional and used only when running in node (passing the node-canvas object).
73+
* _CanvasClass_ : This is optional and used only when running in nodejs (passing an alternative Canvas object for nodejs).
7474

7575

7676

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.2"
45+
"@@VERSION@@" = "1.0.3"
4646

4747
@
4848

build/haar-detector.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* modified port of jViolaJones for Java (http://code.google.com/p/jviolajones/) and OpenCV for C++ (https://github.com/opencv/opencv) to JavaScript
55
*
66
* https://github.com/foo123/HAAR.js
7-
* @version: 1.0.2
7+
* @version: 1.0.3
88
*
99
* Supports parallel "map-reduce" computation both in browser and node using parallel.js library
1010
* https://github.com/adambom/parallel.js (included)
@@ -28,7 +28,7 @@ else if ( !(name in root) ) /* Browser/WebWorker/.. */
2828
* modified port of jViolaJones for Java (http://code.google.com/p/jviolajones/) and OpenCV for C++ (https://github.com/opencv/opencv) to JavaScript
2929
*
3030
* https://github.com/foo123/HAAR.js
31-
* @version: 1.0.2
31+
* @version: 1.0.3
3232
*
3333
* Supports parallel "map-reduce" computation both in browser and node using parallel.js library
3434
* https://github.com/adambom/parallel.js (included)
@@ -37,7 +37,7 @@ else if ( !(name in root) ) /* Browser/WebWorker/.. */
3737
"use strict";
3838

3939
// the export object
40-
var HAAR = { VERSION : "1.0.2" }, Detector, Feature, proto = 'prototype', undef = undefined;
40+
var HAAR = { VERSION : "1.0.3" }, Detector, Feature, proto = 'prototype', undef = undefined;
4141

4242
var // typed arrays substitute
4343
Array32F = (typeof Float32Array !== "undefined") ? Float32Array : Array,
@@ -761,7 +761,7 @@ Detector[proto] = {
761761
*
762762
* * _ImageOrVideoOrCanvas_ : an actual Image or Video element or Canvas Object (in this case they are equivalent).
763763
* * _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)
764-
* * _CanvasClass_ : This is optional and used only when running in node (passing the node-canvas object).
764+
* * _CanvasClass_ : This is optional and used only when running in nodejs (passing an alternative Canvas object for nodejs).
765765
[/DOC_MARKDOWN]**/
766766
image: function(image, scale, canvas) {
767767
var self = this;

0 commit comments

Comments
 (0)