Use CvClassMethodBinding instead of CatchCvExceptionWorker for SeamlessClone, add seamlessClone bindings for Mat

Author: foxxyz

binding.gyp

@@ -41,6 +41,7 @@
 			"cc/io/VideoWriter.cc",
 			"cc/photo/photo.cc",
 			"cc/photo/photoConstants.cc",
+			"cc/photo/MatPhoto.cc",
 			"cc/video/video.cc",
 			"cc/video/BackgroundSubtractor.cc",
 			"cc/video/BackgroundSubtractorMOG2.cc",

cc/core/Mat.cc

@@ -9,6 +9,9 @@
 #ifdef HAVE_OPENCV_IMGPROC
 #include "../imgproc/MatImgproc.h"
 #endif
+#ifdef HAVE_OPENCV_PHOTO
+#include "../photo/MatPhoto.h"
+#endif
 #ifdef HAVE_OPENCV_XIMGPROC
 #include "../ximgproc/MatXimgproc.h"
 #endif
@@ -126,6 +129,9 @@ NAN_MODULE_INIT(Mat::Init) {
 #ifdef HAVE_OPENCV_IMGPROC
   MatImgproc::Init(ctor);
 #endif
+  #ifdef HAVE_OPENCV_PHOTO
+    MatPhoto::Init(ctor);
+  #endif
   #ifdef HAVE_OPENCV_XIMGPROC
   MatXimgproc::Init(ctor);
   #endif

cc/photo/MatPhoto.cc

@@ -0,0 +1,21 @@
+#include "opencv_modules.h"
+
+#ifdef HAVE_OPENCV_PHOTO
+
+#include "MatPhoto.h"
+#include "photoBindings.h"
+
+void MatPhoto::Init(v8::Local<v8::FunctionTemplate> ctor) {
+  Nan::SetPrototypeMethod(ctor, "seamlessClone", SeamlessClone);
+  Nan::SetPrototypeMethod(ctor, "seamlessCloneAsync", SeamlessCloneAsync);
+};
+
+NAN_METHOD(MatPhoto::SeamlessClone) {
+	Mat::syncBinding<PhotoBindings::SeamlessClone>("SeamlessClone", info);
+}
+
+NAN_METHOD(MatPhoto::SeamlessCloneAsync) {
+	Mat::asyncBinding<PhotoBindings::SeamlessClone>("SeamlessClone", info);
+}
+
+#endif

cc/photo/MatPhoto.h

@@ -0,0 +1,15 @@
+#include "Mat.h"
+#include <opencv2/photo.hpp>
+
+#ifndef __FF_MATPHOTO_H__
+#define __FF_MATPHOTO_H__
+
+class MatPhoto {
+public:
+  static void Init(v8::Local<v8::FunctionTemplate> ctor);
+
+  static NAN_METHOD(SeamlessClone);
+  static NAN_METHOD(SeamlessCloneAsync);
+};
+
+#endif

cc/photo/photo.cc

@@ -49,19 +49,11 @@ NAN_METHOD(Photo::InpaintAsync) {
 }
 
 NAN_METHOD(Photo::SeamlessClone) {
-  FF::executeSyncBinding(
-    std::make_shared<PhotoBindings::SeamlessCloningWorker>(),
-    "Photo::SeamlessClone",
-    info
-  );
+  FF::syncBinding<PhotoBindings::SeamlessClone>("Photo", "SeamlessClone", info);
 }
 
 NAN_METHOD(Photo::SeamlessCloneAsync) {
-  FF::executeAsyncBinding(
-    std::make_shared<PhotoBindings::SeamlessCloningWorker>(),
-    "Photo::SeamlessCloneAsync",
-    info
-  );
+  FF::asyncBinding<PhotoBindings::SeamlessClone>("Photo", "SeamlessClone", info);
 }
 
 #endif

cc/photo/photoBindings.h

@@ -1,3 +1,4 @@
+#include "CvBinding.h"
 #include "photo.h"
 
 #ifndef __FF_PHOTOBINDINGS_H_
@@ -87,38 +88,19 @@ namespace PhotoBindings {
     }
   };
 
-  struct SeamlessCloningWorker : public CatchCvExceptionWorker {
+  class SeamlessClone : public CvClassMethodBinding<Mat> {
   public:
-    // required function arguments
-    cv::Mat src;
-    cv::Mat dst;
-    cv::Mat mask;
-    cv::Point2d p;
-    int flags;
-
-    // return value
-    cv::Mat blend;
-
-    bool unwrapRequiredArgs(Nan::NAN_METHOD_ARGS_TYPE info) {
-      return (
-        Mat::Converter::arg(0, &src, info) ||
-        Mat::Converter::arg(1, &dst, info) ||
-        Mat::Converter::arg(2, &mask, info) ||
-        Point2::Converter::arg(3, &p, info) ||
-        FF::IntConverter::arg(4, &flags, info)
-      );
-    }
-
-    std::string executeCatchCvExceptionWorker() {
-      cv::seamlessClone(
-        src, dst, mask, p, blend, flags
-      );
-      return "";
-    }
-
-    v8::Local<v8::Value> getReturnValue() {
-      return Mat::Converter::wrap(blend);
-    }
+    void createBinding(std::shared_ptr<FF::Value<cv::Mat>> self) {
+      auto dst = req<Mat::Converter>();
+      auto mask = req<Mat::Converter>();
+      auto p = req<Point2::Converter>();
+      auto flags = req<FF::IntConverter>();
+      auto blend = ret<Mat::Converter>("blend");
+
+      executeBinding = [=]() {
+        cv::seamlessClone(self->ref(), dst->ref(), mask->ref(), p->ref(), blend->ref(), flags->ref());
+      };
+    };
   };
 
 }