potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2024-08-27 18:31:36 +03:00
parent 41097a48ad 766bad0035
commit 100db1bc0b
108 changed files with 1241 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/android/aar-template/README.md
+1 -1
View File
@@ -1,7 +1,7 @@
## Scripts for creating an AAR package and a local Maven repository with OpenCV libraries for Android
### How to run the scripts
1. Set JAVA_HOME and ANDROID_HOME enviroment variables. For example:
1. Set JAVA_HOME and ANDROID_HOME environment variables. For example:
```
export JAVA_HOME=~/Android Studio/jbr
export ANDROID_HOME=~/Android/SDK
platforms/js/build_js.py
+3 -3
View File
@@ -254,8 +254,7 @@ if __name__ == "__main__":
parser.add_argument('--build_flags', help="Append Emscripten build options")
parser.add_argument('--build_wasm_intrin_test', default=False, action="store_true", help="Build WASM intrin tests")
# Write a path to modify file like argument of this flag
parser.add_argument('--config', default=os.path.join(os.path.dirname(os.path.abspath(__file__)), 'opencv_js.config.py'),
help="Specify configuration file with own list of exported into JS functions")
parser.add_argument('--config', help="Specify configuration file with own list of exported into JS functions")
parser.add_argument('--webnn', action="store_true", help="Enable WebNN Backend")
transformed_args = ["--cmake_option=%s".format(arg) if arg[:2] == "-D" else arg for arg in sys.argv[1:]]
@@ -263,7 +262,8 @@ if __name__ == "__main__":
log.debug("Args: %s", args)
os.environ["OPENCV_JS_WHITELIST"] = os.path.abspath(args.config)
if args.config is not None:
os.environ["OPENCV_JS_WHITELIST"] = os.path.abspath(args.config)
if 'EMMAKEN_JUST_CONFIGURE' in os.environ:
del os.environ['EMMAKEN_JUST_CONFIGURE'] # avoid linker errors with NODERAWFS message then using 'emcmake' launcher