Merge branch 'master' of https://github.com/justadudewhohacks/opencv4nodejs into #57fixes

Author: justadudewhohacks

.dockerignore

@@ -8,5 +8,6 @@ ci/coverage-report
 !cc
 !data/got.jpg
 !data/Lenna.png
+!data/people.jpeg
 !data/traffic.mp4
 !data/text-models

binding.gyp

@@ -47,6 +47,7 @@
 			"cc/modules/objdetect/objdetect.cc",
 			"cc/modules/objdetect/CascadeClassifier.cc",
 			"cc/modules/objdetect/HOGDescriptor.cc",
+			"cc/modules/objdetect/DetectionROI.cc",
 			"cc/modules/machinelearning/machinelearning.cc",
 			"cc/modules/machinelearning/ParamGrid.cc",
 			"cc/modules/machinelearning/StatModel.cc",

cc/AbstractConverter.h

@@ -28,6 +28,10 @@ class SingleTypeConverter {
 		return ConverterType::unwrap(jsVal);
 	}
 
+	static T* unwrapPtr(v8::Local<v8::Value> jsVal) {
+		return ConverterType::unwrapPtr(jsVal);
+	}
+
 	static v8::Local<v8::Value> wrap(T val) {
 		return ConverterType::wrap(val);
 	}
@@ -48,10 +52,18 @@ class AbstractConverter {
 		return ConverterType::unwrap(jsVal);
 	}
 
+	static T* unwrapPtr(v8::Local<v8::Value> jsVal) {
+		return ConverterType::unwrapPtr(jsVal);
+	}
+
 	static v8::Local<v8::Value> wrap(T val) {
 		return ConverterType::wrap(val);
 	}
 
+	static bool unwrap(T* val, v8::Local<v8::Value> jsVal) {
+		return ConverterType::unwrap(val, jsVal);
+	}
+
 	static bool optProp(T* val, const char* prop, v8::Local<v8::Object> opts) {
 		Nan::TryCatch tryCatch;
 		if (

cc/InstanceConverter.h

@@ -18,6 +18,10 @@ class InstanceConverterType {
 		return Nan::ObjectWrap::Unwrap<Clazz>(jsVal->ToObject())->getNativeObject();
 	}
 
+	static T* unwrapPtr(v8::Local<v8::Value> jsVal) {
+		return Nan::ObjectWrap::Unwrap<Clazz>(jsVal->ToObject())->getNativeObjectPtr();
+	}
+
 	static v8::Local<v8::Value> wrap(T val) {
 		v8::Local<v8::Object> jsObj = Nan::NewInstance(Nan::New(Clazz::constructor)->GetFunction()).ToLocalChecked();
 		*Nan::ObjectWrap::Unwrap<Clazz>(jsObj)->getNativeObjectPtr() = val;

cc/modules/objdetect/DetectionROI.cc

@@ -0,0 +1,24 @@
+#include "DetectionROI.h"
+
+Nan::Persistent<v8::FunctionTemplate> DetectionROI::constructor;
+
+NAN_MODULE_INIT(DetectionROI::Init) {
+	v8::Local<v8::FunctionTemplate> ctor = Nan::New<v8::FunctionTemplate>(DetectionROI::New);
+	v8::Local<v8::ObjectTemplate> instanceTemplate = ctor->InstanceTemplate();
+
+	constructor.Reset(ctor);
+	ctor->SetClassName(FF_NEW_STRING("DetectionROI"));
+	instanceTemplate->SetInternalFieldCount(1);
+
+	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("scale"), scaleGet, scaleSet);
+	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("locations"), locationsGet, locationsSet);
+	Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("confidences"), confidencesGet, confidencesSet);
+
+	target->Set(FF_NEW_STRING("DetectionROI"), ctor->GetFunction());
+};
+
+NAN_METHOD(DetectionROI::New) {
+	DetectionROI* self = new DetectionROI();
+	self->Wrap(info.Holder());
+	FF_RETURN(info.Holder());
+};

cc/modules/objdetect/DetectionROI.h

@@ -0,0 +1,54 @@
+#include "Converters.h"
+#include <opencv2/objdetect.hpp>
+#include "Point.h"
+
+#ifndef __FF_DETECTIONROI_H__
+#define __FF_DETECTIONROI_H__
+
+class DetectionROI : public Nan::ObjectWrap {
+public:
+	cv::DetectionROI detectionROI;
+
+  static NAN_MODULE_INIT(Init);
+  static NAN_METHOD(New);
+
+	static FF_GETTER(DetectionROI, scaleGet, detectionROI.scale);
+	static FF_SETTER_NUMBER(DetectionROI, scale, detectionROI.scale);
+	static NAN_GETTER(locationsGet) {
+		FF_VAL val = ObjectArrayConverter<Point2, cv::Point2d, cv::Point>::wrap(Converter::unwrap(info.This()).locations);
+		FF_RETURN(val);
+	}
+
+	static NAN_SETTER(locationsSet) {
+		std::vector<cv::Point> locations;
+		if (ObjectArrayConverter<Point2, cv::Point2d, cv::Point>::unwrap(&locations, value)) {
+			return Nan::ThrowError("expected locations to be an Array of type Point2");
+		}
+		Converter::unwrapPtr(info.This())->locations = locations;
+	}
+
+	static NAN_GETTER(confidencesGet) {
+		FF_RETURN(DoubleArrayConverter::wrap(Converter::unwrap(info.This()).confidences));
+	}
+
+	static NAN_SETTER(confidencesSet) {
+		std::vector<double> confidences;
+		if (DoubleArrayConverter::unwrap(&confidences, value)) {
+			return Nan::ThrowError("expected confidences to be an Array of type Number");
+		}
+		Converter::unwrapPtr(info.This())->confidences = confidences;
+	}
+
+	static Nan::Persistent<v8::FunctionTemplate> constructor;
+
+	cv::DetectionROI* getNativeObjectPtr() { return &detectionROI; }
+	cv::DetectionROI getNativeObject() { return detectionROI; }
+
+	typedef InstanceConverter<DetectionROI, cv::DetectionROI> Converter;
+
+	static const char* getClassName() {
+		return "DetectionROI";
+	}
+};
+
+#endif