From 1fe9dd0c3bc82660c91a23cc75de12c4996e50f7 Mon Sep 17 00:00:00 2001
From: Vincent Rabaud <vrabaud@google.com>
Date: Wed, 18 Dec 2024 11:43:39 +0100
Subject: [PATCH] js: add types included in bound APIs

This fixes #25239
---
 modules/calib3d/misc/js/gen_dict.json | 3 ++-
 modules/js/src/core_bindings.cpp      | 5 +++++
 modules/photo/misc/js/gen_dict.json   | 1 +
 platforms/js/opencv_js.config.py      | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/calib3d/misc/js/gen_dict.json b/modules/calib3d/misc/js/gen_dict.json
index 407ddf1e48..234d906ee8 100644
--- 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
index d5bf9b076c..db1669a825 100644
--- 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
index d8a6db100a..c03b081b34 100644
--- 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
index 1251062e4c..70b1ad9ff9 100644
--- a/platforms/js/opencv_js.config.py
+++ b/platforms/js/opencv_js.config.py
@@ -172,6 +172,7 @@ photo = {'': ['createAlignMTB', 'createCalibrateDebevec', 'createCalibrateRobert
               '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 @@ calib3d = {
         'fisheye_initUndistortRectifyMap',
         'fisheye_projectPoints',
     ],
+    'UsacParams': ['UsacParams']
 }
 
 white_list = makeWhiteList([core, imgproc, objdetect, video, dnn, features2d, photo, calib3d])