Skip to content

Bugfix on import script with web worker.#20424

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
sbajtl:worker-importscript-bugfix
Jul 24, 2021
Merged

Bugfix on import script with web worker.#20424
opencv-pushbot merged 1 commit intoopencv:3.4from
sbajtl:worker-importscript-bugfix

Conversation

@sbajtl
Copy link
Copy Markdown
Contributor

@sbajtl sbajtl commented Jul 18, 2021

  • 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 other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work

Related to #20064 (comment)

force_builders=Custom
buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-4,linux-6

@asmorkalov asmorkalov added the bug label Jul 20, 2021
@alalek
Copy link
Copy Markdown
Member

alalek commented Jul 20, 2021

This patch should go into 3.4 branch first.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

Please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@opencv-pushbot opencv-pushbot merged commit 06dcc5a into opencv:3.4 Jul 24, 2021
@alalek alalek mentioned this pull request Jul 24, 2021
@sbajtl sbajtl deleted the worker-importscript-bugfix branch July 25, 2021 10:10
@vheun
Copy link
Copy Markdown

vheun commented Sep 6, 2021

@alalek is there a solution? Master does not compile to work in a web-worker.

@alalek alalek mentioned this pull request Oct 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants