(5.x) Merge 4.x #3333
Merged
(5.x) Merge 4.x #3333
Conversation
This file contains 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
…dings * add Dictionary bindings * add python tests
Workflow for Github Actions to build and test OpenCV on Linux for 3.4
Tried to build opencv with cmake and got that error:
openCV/opencv_contrib/modules/cudacodec/src/video_reader.cpp:99:14: error: extra qualification ‘{anonymous}::VideoReaderImpl::’ on member ‘set’ [-fpermissive]
99 | void VideoReaderImpl::set(const ColorFormat _colorFormat) CV_OVERRIDE;
| ^~~~~~~~~~~~~~~
Would propose do delete VideoReaderImpl:: in line 99
…_to_nv12 Force VideoReader to decode all YUV video formats to NV12 * Force decoding of all supported YUV inputs to NV12 and log warning to indicate this is taking place. Add YUV output. * Update to include missing CUDA stream argument to raw frame copy. * Fix copy paste oversight.
* Use ceres::Manifolds instead of ceres::LocalParameterization. The latter is deprecated. * Fix typo. * Fix version check. * And more version fixes.
fix axes and docs * fix axes docs, tutorial and add estimateParameters, change estimateParameters in test * update docs, add singlemarkersaxes2.jpg * fix docs
…eature Add RTSP features to cudacodec::VideoReader * Add live video source enhancements, e.g. rtsp from ip camera's Add error logs. * Fix type. * Change badly named flag. * Alter live source flag everywhere to indicate what it does not what it is for, which should be left up to the documentation. * Prevent frame que object from being reinitialized which could be unsafe if another thread and/or object is using it.
create aruco_utils.hpp move Board, GridBoard, CharucoBoard to board.hpp/board.cpp refactoring _getSingleMarkerObjectPoints() refactoring _extractBits() refactoring _findMarkerContours() fix _copyVector2Output() in detectMarkers() move testCharucoCornersCollinear() to board.hpp/board.cpp move poseEstimate()/calibAruco() to aruco_calib_pose.hpp reduce include files move detectMarkers() to class ArucoDetector move refineDetectedMarkers() to class ArucoDetector add C API wrapper to detectMarkers(), refineDetectedMarkers() update tests and samples to class API add py tests: test_aruco_detector, test_aruco_detector_refine refactoring, fix docs add java tests: testArucoIssue3133, testArucoDetector add readWriteParameter(), update readParameter() implemented cv::Algorithm - read/write, added read/write to RefineParameters, added write to DetectorParameters merge PatternPos/EstimateParameters after rebase remove empty docstring for private function fixes fixes license
aruco refactoring and class interface
This reverts commit a96a930.
Fix CUDA mem leak in GFTT and move CUDA malloc out of critical path
uint is defined in sys/types.h in Linux for compatibility.
But it is not defined in Win32 platform. This fixes the following error:
opencv_contrib/modules/sfm/src/libmv_light/libmv/multiview/robust_estimation.h:59:8: error: 'uint' does not name a type; did you mean 'int'?
59 | static uint IterationsRequired(int min_samples,
| ^~~~
| int
Merged
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.
#3229 from AleksandrPanov:add_Dictionary_bindings
#3240 from AleksandrPanov:aruco_add_class_API
#3241 from asenyaev:asen/add_linux_workflow_3.4
#3242 from asenyaev:asen/add_linux_workflow_4.x
#3243 from vrabaud:3.4_ceres
#3244 from hakaboom:extend_orb_interface_
#3247 from cudawarped:videoreader_add_rtsp_feature
#3248 from cudawarped:videoreader_decode_all_to_nv12
#3253 from alalek:fix_warnings_gcc12_3.4
#3256 from AleksandrPanov:fix_aruco_axes_docs
#3257 from asenyaev:asen/move_workflows_3.4
#3258 from asenyaev:asen/move_workflows_4.x
#3264 from sturkmen72:update_python_samples
#3265 from TraubSimon:patch-1
#3266 from nglee:fix_return_by_const_value
#3267 from cudawarped:fix_python_bindings
#3269 from alalek:aruco_merge_fixes
#3271 from twistedfall:ovis-build-fix
#3272 from vrabaud:4.x_compile
#3274 from jmackay2:3.4_ceres_fix
#3277 from iago-suarez:4.x
#3280 from fengyuentau:macOS_workflows_for_4.x
#3281 from fengyuentau:macOS_workflows_for_3.4
#3284 from alalek:aruco_merge_fixes
#3288 from Kumataro:4.x-issue_contrib3276
#3292 from jspricke:jpg_png
#3296 from gvcallen:4.x
#3298 from tomoaki0705:fixWarnings
#3306 from huangqinjin:fix
#3309 from asenyaev:asen/ubuntu14.04_workflow_contrib
#3310 from asenyaev:asen/rename_jobs
#3319 from alalek:rework_psabi_warning
#3324 from kevinchristensen1:gftt-cuda-fix
#3329 from Biswa96:sfml-uint-error
Main PR: opencv/opencv#22408
Previous "Merge 4.x": #3237