chore: reintroduce magnitude

merge master into PR118, uncomment changes from commit:fa5e99c

Author: s-g-1

cc/core/core.cc

@@ -65,8 +65,8 @@ NAN_MODULE_INIT(Core::Init) {
   Nan::SetMethod(target, "solve", Solve);
   Nan::SetMethod(target, "solveAsync", SolveAsync);
 
-  // Nan::SetMethod(target, "magnitude", Magnitude);
-  // Nan::SetMethod(target, "magnitudeAsync", MagnitudeAsync);
+  Nan::SetMethod(target, "magnitude", Magnitude);
+  Nan::SetMethod(target, "magnitudeAsync", MagnitudeAsync);
 
   Nan::SetMethod(target, "getTickFrequency", GetTickFrequency);
   Nan::SetMethod(target, "getTickCount", GetTickCount);
@@ -407,13 +407,13 @@ NAN_METHOD(Core::SolveAsync) {
 	FF::asyncBinding<CoreBindings::Solve>("Core", "Solve", info);
 }
 
-// NAN_METHOD(Core::Magnitude) {
-//   FF::syncBinding<CoreBindings::Magnitude>("Core", "Magnitude", info);
-// }
+NAN_METHOD(Core::Magnitude) {
+  FF::syncBinding<CoreBindings::Magnitude>("Core", "Magnitude", info);
+}
 
-// NAN_METHOD(Core::MagnitudeAsync) {
-//   FF::asyncBinding<CoreBindings::Magnitude>("Core", "Magnitude", info);
-// }
+NAN_METHOD(Core::MagnitudeAsync) {
+  FF::asyncBinding<CoreBindings::Magnitude>("Core", "Magnitude", info);
+}
 
 NAN_METHOD(Core::GetTickFrequency) {
   info.GetReturnValue().Set(FF::IntConverter::wrap(cv::getTickFrequency()));

cc/core/core.h

@@ -63,8 +63,8 @@ class Core : public Nan::ObjectWrap {
 	static NAN_METHOD(EigenAsync);
 	static NAN_METHOD(Solve);
 	static NAN_METHOD(SolveAsync);
-	// static NAN_METHOD(Magnitude);
-	// static NAN_METHOD(MagnitudeAsync);
+	static NAN_METHOD(Magnitude);
+	static NAN_METHOD(MagnitudeAsync);
 
 	static NAN_METHOD(GetTickFrequency);
 	static NAN_METHOD(GetTickCount);

cc/core/coreBindings.h

@@ -285,8 +285,7 @@ namespace CoreBindings {
 		};
 	};
 
-	/*
-	class Magnitude: public CvBinding {
+	class Magnitude : public CvBinding {
 	public:
 		void setup() {
 			auto x = req<Mat::Converter>();
@@ -298,7 +297,6 @@ namespace CoreBindings {
 			};
 		};
 	};
-	*/
 
 }
 

test/tests/core/coreTests.ts

@@ -764,7 +764,6 @@ export default function (args: TestContext) {
     describe('Solve y = x equation on Id = X Id', makeTest([[1, 2], [3, 4]], [[5, 6], [7, 8]], cv.DECOMP_LU, [[-3, -4], [4, 5]]));
   });
 
-  /*
   describe('magnitude', () => {
     const x = new cv.Mat([[0, 1]], cv.CV_32F);
     const y = new cv.Mat([[0, -1]], cv.CV_32F);
@@ -783,6 +782,5 @@ export default function (args: TestContext) {
       expectOutput,
     });
   });
-  */
 
 }

typings/cv.d.ts

@@ -221,5 +221,5 @@ export function minAsync(src1: Mat, src2: Mat, dst: Mat): Promise<Mat>;
 export function max(src1: Mat, src2: Mat, dst: Mat): Mat;
 export function maxAsync(src1: Mat, src2: Mat, dst: Mat): Promise<Mat>;
 
-// export function magnitude(x: Mat, y: Mat, magnitude: Mat): Mat;
-// export function magnitudeAsync(x: Mat, y: Mat, magnitude: Mat): Promise<Mat>;
+export function magnitude(x: Mat, y: Mat, magnitude: Mat): Mat;
+export function magnitudeAsync(x: Mat, y: Mat, magnitude: Mat): Promise<Mat>;