Skip to content

(5.x) Merge 4.x #3075

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 71 commits into from
Oct 15, 2021
Merged

(5.x) Merge 4.x #3075

merged 71 commits into from
Oct 15, 2021

Conversation

alalek
Copy link
Member

@alalek alalek commented Oct 15, 2021

#2937 from scloke:patch-1
#2964 from DumDereDum:icp_docs
#2967 from paroj:rapid_gos
#2972 from Channingss:date_type_fixer
#2973 from rogday:aruco_ids_rw
#2978 from berak:fix_fuzzy_memleak
#2979 from archit120:julia_typepatch
#2981 from DumDereDum:kinfu_python_demo
#2987 from vrabaud:3.4
#2988 from vrabaud:master
#2994 from archit120:julia_phase1
#2999 from cudawarped:fix_cudacodec_stream
#3001 from cudawarped:fix_cudacodec_wh
#3009 from archit120:julia_21-phase2
#3010 from alalek:cmake_eliminate_modules_scope
#3011 from gokberkgul:wrapper-drawCharucoDiamond
#3017 from pauljurczak:patch-3
#3024 from andy-held:charuco-selectAndRefineChessboardCorners
#3025 from svenevs:fixperms-3.4
#3026 from yossato:patch-1
#3027 from yossato:patch-2
#3030 from alalek:fix_msvc_warnings
#3031 from VadimLevin:dev/vlevin/fix-test-aruco-indices-type
#3039 from paroj:ovis_off_aa
#3040 from WN90:or_mnist_Segmentation_fault
#3043 from shah-scalpel:patch-1
#3049 from sturkmen72:clean_up_test_data
#3051 from sturkmen72:restore-removed-code
#3052 from kuloPo-com:fix-cudacodec-perf_video.cpp
#3058 from sturkmen72:cleanup-old-c
#3059 from sturkmen72:patch-2
#3064 from sturkmen72:patch-2
#3065 from sturkmen72:patch-3
#3066 from sturkmen72:update-StructuredEdgeDetection
#3067 from tomoaki0705:fixManySmallCircles
#3068 from vrabaud:3.4

Main PR: opencv/opencv#20886
Previous "Merge 4.x": #2976

berak and others added 30 commits June 15, 2021 13:06
Date type fixer

* Update unicomblock.hpp

modify data type of m_iNowIdx

* Update unicomblock.cpp
There are several operator= overloads and some compilers can be confused.
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
ICP Docs

* add first info

* add main info

* minor fix

* defgroup fix

* move docs to rgbd.hpp

* try to fix

* add f

* fix with f

* minor fix

* final fix

* whitespace fix

* info fix

* uppercase letter

* create md docs

* try to do math in md

* first draft

* minor fix | add to the web docs

* minor fixes

* minor fixes

* add T

* minor fix of meaning

* Update kinfu_icp.markdown

* Update kinfu_icp.markdown

* More edits

* whitespace

* minor changes

Co-authored-by: Rostislav Vasilikhin <[email protected]>
Fix cudacodec so that it can use streams other than the default

* Add stream property to CUVIDPROCPARAMS so that the post processing and mapping (cuvidMapVideoFrame) of a video frame to cuda from the hardware decoder can use streams other than the default.

* Use standard OpenCV StreamAccessor::getStream() method for returning the raw cuda stream.
* Correct width/height returned by cudacodec::VideoReader::FormatInfo()

* Remove redundant calls to VideoCapture
archit120 and others added 27 commits September 29, 2021 13:57
[GSoC] Julia - phase 2

* Use 64bit types by default for int and float

* Type promotion julia

* Fix DNN test

* Remote whitespace
  * sharp Gaussian kernel causes over flow and ends up in blank image

original commit: opencv/opencv@1e74f58
xphoto inpaint shiftmap kdtree crush fix

opencv#965 (comment)
  * edge drawing is NOT bit-exact
There are several operator= overloads and some compilers can be confused.
This is a leftover from opencv#2987
@alalek
Copy link
Member Author

alalek commented Oct 15, 2021

👍

@alalek alalek merged commit fe4221e into opencv:next Oct 15, 2021
@alalek alalek mentioned this pull request Dec 30, 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.