Alexander Alekhin
57ee14d62d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-11-27 16:50:55 +00:00
Christian Clauss
ebe4ca6b60
Fix typos discovered by codespell
2021-11-26 12:29:56 +01:00
Alexander Alekhin
87d4970e8b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-04 19:50:01 +00:00
keroiber
f11f2bfb56
Merge pull request #20743 from keroiber:prefix_js_function_bindings_with_namespace
...
* Prefix global javascript functions with sub-namespaces
* js: handle 'namespace_prefix_override', update filtering
- avoid functions override with same name but different namespace
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2021-10-04 16:51:49 +00:00
Alexander Alekhin
ca8c3dd9b5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-22 12:05:23 +00:00
Alexander Alekhin
a97f6f8058
js: support setLogLevel() / getLogLevel() calls
2021-03-20 18:14:10 +00:00
Alexander Alekhin
b19f860384
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-03-13 13:02:18 +00:00
Ziachnix
960f501cc1
Merge pull request #19284 from Ziachnix:feature/js-qr-code-detector
...
Add QRCodeDetector to JavaScript Build
* ADD: js support for qrCodeDetector
- cherry picked commit to solve rebase error
* CHG. Revert haarcascade path
* FIX: Tests without images
* ADD: decodeCurved
* js(docs): don't require OPENCV_TEST_DATA_PATH
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2021-03-13 12:52:44 +00:00
Alexander Alekhin
6659d55a9d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-20 18:40:22 +00:00
Alexander Alekhin
e6c9291e32
Merge pull request #19180 from alalek:fixup_19161
2020-12-20 18:39:01 +00:00
Alexander Alekhin
a6f14ca97c
js(build): fix generator with Python3
...
- class_info.props is a 'list'
2020-12-20 17:42:47 +00:00
Alexander Alekhin
dac298ef41
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-18 20:47:56 +00:00
Alexander Alekhin
ef27c11d50
Merge pull request #19162 from alalek:backport_18985
2020-12-18 20:29:49 +00:00
Steffen Urban
c2bc171ef6
js: backport PR18985
...
original commit: b82700ae41
2020-12-18 12:12:10 +00:00
Alexander Alekhin
f8740e124c
js: robust code generation
...
- avoid randomized output due to unpredictable dict/set order
2020-12-18 12:02:48 +00:00
Steffen Urban
b82700ae41
Merge pull request #18985 from ZEISS:feature/aruco_js_fix
...
Aruco javascript fix and added functionality
* whitespace
* updated docu. updated regexp.
* update docu
* embindgen regex
* removed parser arg
* remove whitespace
* removed aruco hint
* remove whitespace
* removed aruco hint
* new docu string
* removed extra line
* remove whitespace
* removed aruco hint
* new docu string
* removed extra line
2020-12-18 12:01:48 +00:00
Alexander Alekhin
6fdb7aee84
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-12-04 18:26:58 +00:00
Alexander Alekhin
7e5c4fe1cd
cmake(js): update js targets
...
- unconditional js bindings source code generation
- use common name for tests: opencv_test_js
2020-12-03 14:18:54 +00:00