Merge pull request #118 from s-g-1/issue-50-s-g-1

feat: add cv.magnitude

Author: UrielCh

cc/core/core.cc

@@ -65,6 +65,9 @@ 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, "getTickFrequency", GetTickFrequency);
   Nan::SetMethod(target, "getTickCount", GetTickCount);
 #if CV_VERSION_GREATER_EQUAL(3, 4, 2)
@@ -404,6 +407,14 @@ 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::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,6 +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(GetTickFrequency);
 	static NAN_METHOD(GetTickCount);

cc/core/coreBindings.h

@@ -285,6 +285,19 @@ namespace CoreBindings {
 		};
 	};
 
+	class Magnitude : public CvBinding {
+	public:
+		void setup() {
+			auto x = req<Mat::Converter>();
+			auto y = req<Mat::Converter>();
+			auto magnitude = ret<Mat::Converter>("magnitude");
+
+			executeBinding = [=]() {
+				cv::magnitude(x->ref(), y->ref(), magnitude->ref());
+			};
+		};
+	};
+
 }
 
 #endif

test/tests/core/coreTests.ts

@@ -763,4 +763,28 @@ export default function (args: TestContext) {
     describe('Solve y = x equation on Id = X Id', makeTest([[1, 0, 0], [0, 1, 0], [0, 0, 1]], [[1, 0, 0], [0, 1, 0], [0, 0, 1]], cv.DECOMP_LU, [[1, 0, 0], [0, 1, 0], [0, 0, 1]]));
     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([[2,0],[0,-2]], cv.CV_32F);
+    const y = new cv.Mat([[0,1],[-1,0]], cv.CV_32F);
+
+    const expectOutput = (res: Mat) => {
+      expect(res).to.be.instanceOf(cv.Mat);
+      // Yields: [[2, 1],[1, 2]]
+      expect(res.at(0,0)).to.equal(2)
+      expect(res.at(0,1)).to.equal(1)
+      expect(res.at(1,1)).to.equal(2)
+    };
+
+    generateAPITests({
+      getDut: () => cv,
+      hasAsync: true,
+      methodName: 'magnitude',
+      getRequiredArgs: () => ([
+        x, y,
+      ]),
+      expectOutput,
+    });
+  });
+
 }

typings/cv.d.ts

@@ -220,3 +220,6 @@ 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>;