Merge pull request #181 from justadudewhohacks/typescript-definitions

Typescript definitions

Author: justadudewhohacks

.gitattributes

@@ -1 +1,3 @@
-*.sh* text eol=lf
+*.sh* text eol=lf
+*.d.ts linguist-vendored=false
+/examples/* linguist-documentation=false

.gitignore

@@ -9,4 +9,5 @@ coverage
 coverage-report
 tmpdata
 data/dnn
-.idea/
+.idea/
+dist

.npmignore

@@ -14,4 +14,5 @@ coverage
 coverage-report
 tmpdata
 ci
-.dockerignore
+.dockerignore
+dist

cc/core/Point.cc

@@ -29,6 +29,8 @@ NAN_MODULE_INIT(Point::Init) {
   ctor->InstanceTemplate()->SetInternalFieldCount(1);
   ctor->SetClassName(Nan::New("Point").ToLocalChecked());
   target->Set(Nan::New("Point").ToLocalChecked(), ctor->GetFunction());
+  target->Set(Nan::New("Point2").ToLocalChecked(), ctor->GetFunction());
+  target->Set(Nan::New("Point3").ToLocalChecked(), ctor->GetFunction());
 };
 
 NAN_METHOD(Point::New) {

cc/core/Vec.cc

@@ -43,6 +43,9 @@ NAN_MODULE_INIT(Vec::Init) {
   ctor->InstanceTemplate()->SetInternalFieldCount(1);
   ctor->SetClassName(Nan::New("Vec").ToLocalChecked());
   target->Set(Nan::New("Vec").ToLocalChecked(), ctor->GetFunction());
+  target->Set(Nan::New("Vec2").ToLocalChecked(), ctor->GetFunction());
+  target->Set(Nan::New("Vec3").ToLocalChecked(), ctor->GetFunction());
+  target->Set(Nan::New("Vec4").ToLocalChecked(), ctor->GetFunction());
 };
 
 NAN_METHOD(Vec::New) {

examples/templateMatching/original.jpg renamed to data/findwaldo.jpg

@@ -5,7 +5,7 @@ const {
 } = require('../utils');
 
 module.exports = function () {
-  const modelPath = '../../data/dnn/facenet';
+  const modelPath = path.resolve(__dirname, '../../data/dnn/facenet');
 
   const prototxt = path.resolve(modelPath, 'facenet.prototxt');
   const modelFile = path.resolve(modelPath, 'res10_300x300_ssd_iter_140000.caffemodel');

examples/templateMatching/waldo.jpg renamed to data/waldo.jpg

@@ -46,7 +46,7 @@ function classifyImg(img) {
 
 const makeDrawClassDetections = predictions => (drawImg, className, getColor, thickness = 2) => {
   predictions
-    .filter(p => p.className === className)
+    .filter(p => classNames[p.classLabel] === className)
     .forEach(p => drawRect(drawImg, p.rect, getColor(), { thickness }));
   return drawImg;
 };

examples/dnn/loadFacenet.js

@@ -41,9 +41,13 @@ const lbph = new cv.LBPHFaceRecognizer();
 lbph.train(trainImgs, labels);
 
 const twoFacesImg = cv.imread(path.resolve(basePath, 'daryl-rick.jpg'));
-const faces = classifier.detectMultiScale(twoFacesImg.bgrToGray()).objects;
+const result = classifier.detectMultiScale(twoFacesImg.bgrToGray());
 
-faces.forEach((faceRect) => {
+const minDetections = 10;
+result.objects.forEach((faceRect, i) => {
+  if (result.numDetections[i] < minDetections) {
+    return;
+  }
   const faceImg = twoFacesImg.getRegion(faceRect).bgrToGray();
   const who = nameMappings[lbph.predict(faceImg).label];