Skip to content

js: add types included in bound APIs#26638

Merged
asmorkalov merged 1 commit intoopencv:4.xfrom
vrabaud:opencv_js1
Dec 19, 2024
Merged

js: add types included in bound APIs#26638
asmorkalov merged 1 commit intoopencv:4.xfrom
vrabaud:opencv_js1

Conversation

@vrabaud
Copy link
Copy Markdown
Contributor

@vrabaud vrabaud commented Dec 18, 2024 •
edited by asmorkalov
Loading

This fixes #25239

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
force_builders=Custom
build_image:Docs=docs-js
Xbuild_image:Custom=javascript
Xbuild_image:Custom=javascript-simd
Xbuild_image:Custom=javascript-simd:3.1.64
build_image:Custom=javascript:3.1.64
buildworker:Custom=linux-4

@vrabaud vrabaud requested a review from asmorkalov December 18, 2024 10:46
@vrabaud vrabaud mentioned this pull request Dec 18, 2024
Merged
4 tasks
@asmorkalov asmorkalov added this to the 4.11.0 milestone Dec 18, 2024
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Dec 18, 2024

Looks like #26640 should be merged first

cd /mnt/Projects/Projects/opencv-build-js/js/modules/js && /usr/bin/ccache /mnt/Projects/Projects/emsdk/upstream/emscripten/em++ -D_USE_MATH_DEFINES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS @CMakeFiles/opencv_js.dir/includes_CXX.rsp -s SINGLE_FILE=1 -s USE_PTHREADS=0 -s EXPORTED_FUNCTIONS="['_malloc', '_free']"   -fsigned-char -W -Wall -Wreturn-type -Wnon-virtual-dtor -Waddress -Wsequence-point -Wformat -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wundef -Winit-self -Wpointer-arith -Wshadow -Wsign-promo -Wuninitialized -Winconsistent-missing-override -Wno-delete-non-virtual-dtor -Wno-unnamed-type-template-args -Wno-comment -Wno-deprecated-enum-enum-conversion -Wno-deprecated-anon-enum-enum-conversion -fdiagnostics-show-option -Qunused-arguments -ffunction-sections -fdata-sections  -fvisibility=hidden -fvisibility-inlines-hidden -O3 -DNDEBUG  -DNDEBUG -std=c++11   -std=c++11  -Wno-missing-prototypes -MD -MT modules/js/CMakeFiles/opencv_js.dir/__/js_bindings_generator/gen/bindings.cpp.o -MF CMakeFiles/opencv_js.dir/__/js_bindings_generator/gen/bindings.cpp.o.d -o CMakeFiles/opencv_js.dir/__/js_bindings_generator/gen/bindings.cpp.o -c /mnt/Projects/Projects/opencv-build-js/js/modules/js_bindings_generator/gen/bindings.cpp
em++: warning: linker setting ignored during compilation: 'SINGLE_FILE' [-Wunused-command-line-argument]
em++: warning: linker setting ignored during compilation: 'EXPORTED_FUNCTIONS' [-Wunused-command-line-argument]
/mnt/Projects/Projects/opencv-build-js/js/modules/js_bindings_generator/gen/bindings.cpp:2658:35: error: binding reference of type 'vector<...>' to value of type 'const vector<...>' drops 'const' qualifier
 2658 |         return arg0.process(arg1, arg2, arg3, arg4);
      |                                   ^~~~
/mnt/Projects/Projects/opencv/modules/photo/include/opencv2/photo.hpp:460:76: note: passing argument to parameter 'dst' here
  460 |     CV_WRAP virtual void process(InputArrayOfArrays src, std::vector<Mat>& dst,
      |                                                                            ^
/mnt/Projects/Projects/opencv-build-js/js/modules/js_bindings_generator/gen/bindings.cpp:3789:90: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
 3789 |     Mat aruco_Dictionary_getBitsFromByteList_wrapper(cv::aruco::Dictionary& arg0 , const const cv::Mat&& arg1, int arg2) {
      |                                                                                          ^~~~~
/mnt/Projects/Projects/opencv-build-js/js/modules/js_bindings_generator/gen/bindings.cpp:3793:90: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
 3793 |     Mat aruco_Dictionary_getByteListFromBits_wrapper(cv::aruco::Dictionary& arg0 , const const cv::Mat&& arg1) {
      |                                                                                          ^~~~~
/mnt/Projects/Projects/opencv-build-js/js/modules/js_bindings_generator/gen/bindings.cpp:5421:28: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
 5421 |         .constructor<const const cv::Mat&&, int, int>()
      |                            ^~~~~
/mnt/Projects/Projects/opencv-build-js/js/modules/js_bindings_generator/gen/bindings.cpp:5424:97: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
 5424 |         .class_function("getBitsFromByteList", select_overload<Mat(cv::aruco::Dictionary&,const const cv::Mat&&,int)>(&Wrappers::aruco_Dictionary_getBitsFromByteList_wrapper))
      |                                                                                                 ^~~~~
/mnt/Projects/Projects/opencv-build-js/js/modules/js_bindings_generator/gen/bindings.cpp:5425:97: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
 5425 |         .class_function("getByteListFromBits", select_overload<Mat(cv::aruco::Dictionary&,const const cv::Mat&&)>(&Wrappers::aruco_Dictionary_getByteListFromBits_wrapper))
      |                                                                                                 ^~~~~
5 warnings and 1 error generated.

@asmorkalov asmorkalov self-assigned this Dec 18, 2024
@asmorkalov asmorkalov merged commit 5cd4483 into opencv:4.x Dec 19, 2024
@vrabaud vrabaud deleted the opencv_js1 branch December 19, 2024 13:34
@asmorkalov asmorkalov mentioned this pull request Jan 15, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@asmorkalov asmorkalov asmorkalov approved these changes

Assignees

@asmorkalov asmorkalov

Labels

category: javascript (js)

Projects

None yet

Milestone

4.11.0

Development

Successfully merging this pull request may close these issues.

When binding APIs in opencv.js, corresponding structs/enums should be bound

2 participants

@vrabaud @asmorkalov