Skip to content

Move big objects (>20k) from stack to heap.#19143

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
vrabaud:stack
Dec 17, 2020
Merged

Move big objects (>20k) from stack to heap.#19143
opencv-pushbot merged 1 commit intoopencv:3.4from
vrabaud:stack

Conversation

@vrabaud
Copy link
Copy Markdown
Contributor

@vrabaud vrabaud commented Dec 16, 2020

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • 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

@alalek
Copy link
Copy Markdown
Member

alalek commented Dec 16, 2020

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".

alalek
alalek reviewed Dec 16, 2020
View reviewed changes
modules/flann/include/opencv2/flann/general.h Outdated
#ifndef OPENCV_FLANN_GENERAL_H_
#define OPENCV_FLANN_GENERAL_H_

#if CV_VERSION_MAJOR == 4
Copy link
Copy Markdown
Member

@alalek alalek Dec 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<= 4 for 3.4 branch

@vrabaud vrabaud changed the base branch from master to 3.4 December 17, 2020 08:34
@vrabaud
Copy link
Copy Markdown
Contributor Author

vrabaud commented Dec 17, 2020

Moved to 3.4 branch. Sorry, there was some FLANN stuff in there, that is a different PR. Fixed AutoBuffer<short, 0>

alalek
alalek approved these changes Dec 17, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@opencv-pushbot opencv-pushbot merged commit e271623 into opencv:3.4 Dec 17, 2020
@alalek alalek mentioned this pull request Dec 17, 2020
Merged
@vrabaud vrabaud deleted the stack branch December 19, 2020 07:12
@alalek alalek mentioned this pull request Apr 9, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: flann category: imgproc

Projects

None yet

Milestone

3.4.13

Development

Successfully merging this pull request may close these issues.

3 participants

@vrabaud @alalek @opencv-pushbot