(5.x) Merge 4.x #2919
Merged
(5.x) Merge 4.x #2919
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
- GCC 4.8.5 / CentOS 7
freetype2: Fix comments in freetype.hpp and README.md * freetype2: Update README.md * freetype2: Update freetype.hpp * freetype2: remove new blank line * Update README.md - Remove dots from the Headers - Align number of === / --- symbols on the next line * freetype: remove comment for color.
* Added BEBLID local feature descriptor * Solved format problems, moved descriptor data to .hpp files and added BeblidSize enum * Deleting guards from BEBLID parameter files * Using int for the BeblidSize, using at<> to access matrix and releasing descriptors when no keypoints are detected.
Images are InputArrays and need not beeing copied here.
…al_matching_implementation
The character literal overload is more efficient. More info at: http://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html
Added stream support on hough circles, lines and segments * Added stream support on hough circles lines and segments - Passed the stream to the different cuda, OpenCV and thurst library calls - Replace all device by cuda synchronizes - Added extra synchronize calls after device to host transfers - Replaced the cuda globals by allocated values * Fixed missing include for CUDA 8 Co-authored-by: william.fink <[email protected]>
RGBD tests refactoring * add GPU and CPU versions of tests * reduce time for demo show * add assert info and scene minor fix * add display to perf_test * replace extra code by function in perf_test * add display func for tests * add settings class for test * remove extra code * replace scene in perf test * main dug fixed * fix the same bug * fix * docs fix * minor fix * namespace fix * tsdf cpu getnormal fix * add folder ocl with simple tests * build error fix
Pose Graph rewritten without Ceres * Works well on g2o dataset, cumulative: 1. Pose3d done w/o Eigen types; 2. PoseGraph nodes vector<Node> -> map<int, Node> 3. Eigen is not used in cost function or parametrization 4. Cost function debugged & fixed (original one was wrong), rewritten from Automatic to Analytic * g2o dataset reading added to PoseGraph * sparse solver fixes from DynaFu draft * Eigen cost function and parametrization removed + g2o reading fixed * refactored: pose error, pose graph edge, pose graph node * sparse solve: templated * MyOptimize(): 1st version * several fixes and TODOs for future * sparse block matrix: val functions, template type * works at Ceres quality (cleanup needed) * MyOptimize() is set to default optimizer * Ceres thrown away, PoseGraph class and header/source code reorganized * pose, node, edge -> nested for PoseGraph * warnings fixed * jacobiScaling disabled for better performance + minors * trailing whitespace fixed * more warnings fixed * message added: Eigen is required for build + minors * trying to fix warning * try to fix "unreachable code" warning * trying to fix unreachable code, pt.3 * trying to fix unreachable code, pt. 5 * trying to fix unreachable code, pt. the worst + minors * try to fix unreachable code, pt. the ugliest * trying to fix unreachable code, pt. the grumpiest * cout -> CV_LOG_INFO * quat matrix functions moved outside cv and kinfu namespaces * unused function fix * pose graph made public (but in detail namespace) + test for pose graph * minor: prints * Pose Graph interface settled * Pose graph interface and its use updated * cos -> std::cos * cout -> CV_LOG_INFO * pose graph interface updated: implementation * Pose Graph Node and Edge: extra fields dropped * more minor refactor-like fixes * return and finish condition fixed * more updates to test * test disabled for Debug builds because 400 sec is too much * whitespace * Disable pose graph test if there's no Eigen * more unused vars * fixing unused function warning * less includes * "verbose" removed * write obj to file only when debug level is raised * License + include guard * skip test using tags and SkipTestException * suppress "unused function" warning * minor
* EdgeDrawing algorithms (ED EDPF EDLines EDCircles) * eliminate build warning
It is now had been what was wanted to be here. Or we may do some asserts before e.g. `CV_ASSERT(candidateBits.rows == candidateBits.cols); `.
* python binding for viz tutorial widget pose reset test_tutorial 2 & 3 sample py 9 test sur 22 test PyWCloudNormal 16 sur 22 end? python test * oops * bug * comment but( this is not solved opencv#2882 (comment) * review 2 * oversight * oversight oops * viz: move out Py* classes from public C++ headers * viz: recover PyColor Co-authored-by: Alexander Alekhin <[email protected]>
backport of commit: d8197c6
Colored Kinect Fusion * create dummy unworked classes * dummy class works * colored kinfu demo minor changes * add simple rgb reader and writer * add rgb info to tsdf * add new raycast * replace TsdfVoxel with RGBTsdfVoxel; integrate done * add colors info to raycast * just render colors * color processing fix * intergrate color fix * add simple shift; minor fixes * add cv_errors for not implemented functions * minor fixes * made calibration * makeColoredFrameFromDepth works * remove comments * makeColoredFrameFromDepth fix * RGBSoure remove extra code * RGBSoure remove extra code 1 * simple fix of bug with rgb size * minor fix * docs fix * docs fix * unused parameter fix * warnings fix * fix tsdf errors; rgbd_perf warnings * fix errors * minor fix * debug print * debug print 2 * debug print 3 * invoker fix * minor fix * remove debug cout * add simple tests * docs fix * warnings fix * minor fix * function warning fix * add vectorized code * minor fixes * minor speed up * minor fixes; renaming * new minor fixes * bug fix * minor fix * test update * extra code removed * bugfix; warning fix * simple interpolation * minor fix * color work minor fix * vectorized interpolation * minor fix
|
👍 |
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.
58 PRs
#2313 from sturkmen72:test_Edge_Drawing_Algos
#2734 from DumDereDum:new_HashTSDF_GPU_class
#2769 from ZEISS:feature/aruco_js
#2772 from fixstars:add_cudastereo_semi_global_matching_implementation
#2774 from iago-suarez:master
#2775 from alalek:4.x_build_warnings_gcc_4.8.5
#2776 from Kumataro:master_freetype2_doc
#2778 from txpaper:master
#2785 from esopalumpa:3.4
#2791 from vrabaud:3.4
#2793 from alalek:workaround_2738
#2795 from cudawarped:fix_nvidia_video_codec_11_0
#2799 from paroj:oshadow
#2801 from Atlas42:cuda-hough-stream-fix
#2803 from amiller27:inrange
#2804 from MrKepzie:optflow-rlof-crash
#2805 from nglee:dev_gpumatnd1
#2806 from vpisarev:kinfu_demo_orbbec
#2807 from vchiluka5:NVIDIA_OPTICAL_FLOW_SDK_2.0_INTEGRATION
#2819 from LaurentBerger:pyb_qd
#2820 from alalek:3.4-issue_1301
#2821 from WeChatCV:wechat_qrcode
#2822 from DumDereDum:hash_tsdf_bug_fix
#2824 from tomoaki0705:fixBuildCudaOptFlow
#2827 from vpisarev:wechat_qrcode_win_fix
#2831 from tomoaki0705:fixRgbdOpenCL
#2832 from tsenst:Resolve_Issue_2796_RICInterpolation
#2836 from tomoaki0705:fixBuildCudaOptFlow
#2839 from DumDereDum:issue_2818
#2841 from AAArthurLiu:fix-typo-in-modules-readme
#2845 from kevineor:DeltaECIEDE2000-fix
#2846 from tomoaki0705:fixCUDASurfFailure
#2849 from WeChatCV:wechat_qrcode
#2851 from paroj:ofix
#2853 from DumDereDum:iss2817
#2854 from DumDereDum:rgbd_test_refactoring
#2858 from tomoaki0705:fixRgbdSegmentationFault
#2860 from Sintun:master
#2866 from paroj:ofix
#2868 from nkwangyh:local
#2869 from dimitrisPs:QDS_getDisparity
#2875 from rgolovanov:master
#2878 from DumDereDum:colored_kinfu
#2882 from LaurentBerger:python_viz
#2890 from dzywater:master
#2892 from savuor:posegraph_no_ceres
#2894 from berak:imgproc_fix_thinning
#2896 from paroj:otest
#2897 from Chester-zZz:wechat-qrcode
#2900 from spirraw:master
#2903 from alalek:cmake_fix_tracking_headers
#2906 from SunAriesCN:patch-2
#2909 from alalek:build_warnings
#2912 from sturkmen72:update_fast_line_detector
#2914 from pathbreak:dnn-sr-doc
#2915 from alalek:backport_2716
#2916 from berak:wechat_qr_fix_iconv_mingw
#2918 from alalek:fix_whitespace
Main PR: opencv/opencv#19885
Previous "Merge 4.x": #2768
Diff files (~45k lines):