opencv.js: fix the loading issue of opencv.js(WASM) in face recognition#14737
Merged
opencv-pushbot merged 1 commit intoopencv:3.4from Jun 20, 2019
Merged
opencv.js: fix the loading issue of opencv.js(WASM) in face recognition#14737opencv-pushbot merged 1 commit intoopencv:3.4from
opencv-pushbot merged 1 commit intoopencv:3.4from
Conversation
Contributor
Author
|
@alalek Does it mean I need rebase this branch to branch 3.4? or master? |
Member
|
Yes, this patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly). So, please:
Note: no needs to re-open PR, apply changes "inplace". |
dkurt
reviewed
Jun 11, 2019
| }; | ||
|
|
||
| function main() { | ||
| // Create a camera object. |
Member
There was a problem hiding this comment.
I think that we can keep main function unchanged but do something like that:
function main() {
// ...
}
utils.loadOpenCv(() => {
main();
}and
<body>instead of
<body onload="main()">
Contributor
Author
There was a problem hiding this comment.
Sounds good! Thanks!
Contributor
Author
|
@alalek Thanks! Finished with rebase. |
dkurt
approved these changes
Jun 20, 2019
Member
dkurt
left a comment
There was a problem hiding this comment.
Looks good to merge, thank you! 👍
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix #14734
Add
utilt.loadOpenCv()at the beginning ofmain(), and set the originalmain()as its onloadCallback function.Now the face recognition sample can load both opencv.js(asm.js) and opencv.js(WASM).