Moved aruco dictionary globals into getPredefinedDictionary to allow lazy-loading of the opencv DLL #2193
Conversation
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
alalek
reviewed
Jul 21, 2019
There was a problem hiding this comment.
This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).
So, 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)
whereupstreamis configured by following this GitHub guide and fetched (git fetch upstream). - push rebased commits into source branch of your fork (with
--forceoption)
Note: no needs to re-open PR, apply changes "inplace".
modules/aruco/src/dictionary.cpp
Outdated
| Ptr<Dictionary> getPredefinedDictionary(PREDEFINED_DICTIONARY_NAME name) | ||
| { | ||
| // DictionaryData constructors calls | ||
| // moved out of globals so construted on first use, which allows lazy-loading of opencv dll |
…ucted on first use, to allow lazy-loading of the opencv DLL
alalek
approved these changes
Aug 15, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pullrequest changes
I want to lazy-load my opencv dll, to which I've added the aruco module.
But as these objects are constructed globally the system crashes as I've not loaded the DLL yet.
Moving them into the only place they're used, constructed statically, they construct on first use, and only after I've loaded the DLL.
Having statics hidden in a function isn't the greatest of solutions, but then I wouldn't have made them globals anyway :)