Skip to content

(4.x) Merge 3.4 #2992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 1, 2021
Merged

(4.x) Merge 3.4 #2992

merged 4 commits into from
Jul 1, 2021

Conversation

alalek
Copy link
Member

@alalek alalek commented Jul 1, 2021

#2937 from scloke:patch-1
#2987 from vrabaud:3.4

Main PR: opencv/opencv#20339
Previous "Merge 3.4": #2982

force_builders=Custom,Win64 OpenCL
buildworker:Custom=linux-4,linux-6
build_image:Custom=ubuntu-cuda:18.04
buildworker:Win64 OpenCL=windows-2
build_image:Win64 OpenCL=msvs2019

vrabaud and others added 4 commits June 29, 2021 16:11
There are several operator= overloads and some compilers can be confused.
* Divide by zero error in SEEDS Superpixels opencv#2935

When processing a large number of images, a program crash can occur with a divide by zero error in the above function. Changing the order of multiplication / division avoids a division by zero.

* Update seeds.cpp

Minor corrections
@alalek
Copy link
Member Author

alalek commented Jul 1, 2021

👍

@alalek alalek merged commit 457740f into opencv:master Jul 1, 2021
@alalek alalek mentioned this pull request Aug 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants