Skip to content

Commit bfd892e

Browse files
justadudewhohacksjustadudewhohacks
committed
Merge branch 'master' into nodejs
2 parents fdc7566 + df40bb4 commit bfd892e

File tree

126 files changed

+162
-2239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+162
-2239
lines changed

‎.travis.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ node_js:
44
- "10"
55
env:
66
- BACKEND_CPU=true EXCLUDE_UNCOMPRESSED=true
7-
before_script:
8-
- wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
9-
- sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
10-
- sudo apt-get update
11-
- sudo apt-get install google-chrome-stable
12-
- export DISPLAY=:99.0
13-
- sh -e /etc/init.d/xvfb start
7+
addons:
8+
chrome: stable
9+
before_install:
10+
- export DISPLAY=:99.0
11+
- sh -e /etc/init.d/xvfb start
12+
- sleep 3 # give xvfb some time to start
1413
script:
1514
- npm run test-travis
1615
- npm run build

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ const detection = await faceapi.detectSingleFace(input)
204204
By default **detectAllFaces** and **detectSingleFace** utilize the SSD Mobilenet V1 Face Detector. You can specify the face detector by passing the corresponding options object:
205205

206206
``` javascript
207-
const detections1 = await faceapi.detectAllFaces(input, new SsdMobilenetv1Options())
208-
const detections2 = await faceapi.detectAllFaces(input, new TinyFaceDetectorOptions())
209-
const detections3 = await faceapi.detectAllFaces(input, new MtcnnOptions())
207+
const detections1 = await faceapi.detectAllFaces(input, new faceapi.SsdMobilenetv1Options())
208+
const detections2 = await faceapi.detectAllFaces(input, new faceapi.inyFaceDetectorOptions())
209+
const detections3 = await faceapi.detectAllFaces(input, new faceapi.MtcnnOptions())
210210
```
211211

212212
You can tune the options of each face detector as shown [here](#usage-face-detection-options).
@@ -380,7 +380,7 @@ export interface ISsdMobilenetv1Options {
380380
}
381381

382382
// example
383-
const options = new SsdMobilenetv1Options({ minConfidence: 0.8 })
383+
const options = new faceapi.SsdMobilenetv1Options({ minConfidence: 0.8 })
384384
```
385385

386386
### TinyFaceDetectorOptions
@@ -401,7 +401,7 @@ export interface ITinyFaceDetectorOptions {
401401
}
402402

403403
// example
404-
const options = new TinyFaceDetectorOptions({ inputSize: 320 })
404+
const options = new faceapi.TinyFaceDetectorOptions({ inputSize: 320 })
405405
```
406406

407407
### MtcnnOptions
@@ -435,7 +435,7 @@ export interface IMtcnnOptions {
435435
}
436436

437437
// example
438-
const options = new MtcnnOptions({ minFaceSize: 100, scaleFactor: 0.8 })
438+
const options = new faceapi.MtcnnOptions({ minFaceSize: 100, scaleFactor: 0.8 })
439439
```
440440

441441
<a name="usage-utility-classes"></a>

‎build/commonjs/allFacesFactory.d.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎build/commonjs/allFacesFactory.js

Lines changed: 0 additions & 129 deletions
This file was deleted.

‎build/commonjs/allFacesFactory.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/commonjs/faceDetectionNet/FaceDetectionNet.d.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)