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
3eea3dd46b
imgproc: add IntelligentScissors
2020-12-25 10:57:11 +00:00
Steffen Urban
c2bc171ef6
js: backport PR18985
...
original commit: b82700ae41
2020-12-18 12:12:10 +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
0d7f770996
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-11-04 09:58:29 +00:00
Dizhenin Vlad
edc5518f68
Merge pull request #15608 from SimpleVlad:3.4
...
* Add flags for build js
* Add poi.json
* Rebase whitelist into JSON file
* Rework generator of white_list
* Fix small typos
* Transfer opencv_js.josn in opencv_js.config.py
* Edit OPENCV_JS_WHITELIST
* Write comment
* Add description
* Fix typos in desc
* flag's append deleeted
* Fix whitespace
* variable deleted
* fix comment on lines 229 and 235
2019-10-31 22:09:33 +03:00