Merge pull request #26638 from vrabaud:opencv_js1

asmorkalov · web-flow · commit 5cd448377a3a · 2024-12-19T08:11:54.000+03:00
js: add types included in bound APIs
diff --git a/modules/calib3d/misc/js/gen_dict.json b/modules/calib3d/misc/js/gen_dict.json
@@ -16,6 +16,7 @@
             "undistort",
             "fisheye_initUndistortRectifyMap",
             "fisheye_projectPoints"
-        ]
+        ],
+        "UsacParams": ["UsacParams"]
     }
 }
diff --git a/modules/js/src/core_bindings.cpp b/modules/js/src/core_bindings.cpp
@@ -467,11 +467,15 @@ EMSCRIPTEN_BINDINGS(binding_utils)
     register_vector<double>("DoubleVector");
     register_vector<std::string>("StringVector");
     register_vector<cv::Point>("PointVector");
+    register_vector<cv::Point3f>("Point3fVector");
     register_vector<cv::Mat>("MatVector");
     register_vector<cv::Rect>("RectVector");
     register_vector<cv::KeyPoint>("KeyPointVector");
     register_vector<cv::DMatch>("DMatchVector");
+    register_vector<std::vector<char>>("CharVectorVector");
     register_vector<std::vector<cv::DMatch>>("DMatchVectorVector");
+    register_vector<std::vector<cv::KeyPoint>>("KeyPointVectorVector");
+    register_vector<std::vector<cv::Point>>("PointVectorVector");
 
 
     emscripten::class_<cv::Mat>("Mat")
@@ -598,6 +602,7 @@ EMSCRIPTEN_BINDINGS(binding_utils)
 
     EMSCRIPTEN_CV_POINT(Point)
     EMSCRIPTEN_CV_POINT(Point2f)
+    EMSCRIPTEN_CV_POINT(Point3f)
 
 #define EMSCRIPTEN_CV_RECT(type, name) \
     emscripten::value_object<cv::Rect_<type>> (name) \
diff --git a/modules/photo/misc/js/gen_dict.json b/modules/photo/misc/js/gen_dict.json
@@ -6,6 +6,7 @@
                     "createMergeDebevec", "createMergeMertens", "createMergeRobertson",
                     "createTonemapDrago", "createTonemapMantiuk", "createTonemapReinhard", "inpaint"],
             "CalibrateCRF": ["process"],
+            "AlignExposures": ["process"],
             "AlignMTB" : ["calculateShift", "shiftMat", "computeBitmaps", "getMaxBits", "setMaxBits",
                             "getExcludeRange", "setExcludeRange", "getCut", "setCut"],
             "CalibrateDebevec" : ["getLambda", "setLambda", "getSamples", "setSamples", "getRandom", "setRandom"],
diff --git a/platforms/js/opencv_js.config.py b/platforms/js/opencv_js.config.py
@@ -172,6 +172,7 @@
               'createMergeDebevec', 'createMergeMertens', 'createMergeRobertson', \
               'createTonemapDrago', 'createTonemapMantiuk', 'createTonemapReinhard', 'inpaint'],
         'CalibrateCRF': ['process'],
+        'AlignExposures': ['process'],
         'AlignMTB' : ['calculateShift', 'shiftMat', 'computeBitmaps', 'getMaxBits', 'setMaxBits', \
                       'getExcludeRange', 'setExcludeRange', 'getCut', 'setCut'],
         'CalibrateDebevec' : ['getLambda', 'setLambda', 'getSamples', 'setSamples', 'getRandom', 'setRandom'],
@@ -208,6 +209,7 @@
         'fisheye_initUndistortRectifyMap',
         'fisheye_projectPoints',
     ],
+    'UsacParams': ['UsacParams']
 }
 
 white_list = makeWhiteList([core, imgproc, objdetect, video, dnn, features2d, photo, calib3d])

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`"undistort",`
`17`	`17`	`"fisheye_initUndistortRectifyMap",`
`18`	`18`	`"fisheye_projectPoints"`
`19`		`- ]`
	`19`	`+ ],`
	`20`	`+ "UsacParams": ["UsacParams"]`
`20`	`21`	`}`
`21`	`22`	`}`