Alexander Alekhin [Tue, 24 Jul 2018 19:48:46 +0000 (22:48 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 24 Jul 2018 15:15:10 +0000 (15:15 +0000)]
Merge pull request #1696 from bill2239:fix_densecensus
Li-Chi Huang [Thu, 19 Jul 2018 22:32:22 +0000 (17:32 -0500)]
fix densecensus when compute
Alexander Alekhin [Mon, 23 Jul 2018 12:20:22 +0000 (12:20 +0000)]
Merge pull request #1697 from dianlujitao:3.4
dianlujitao [Sun, 22 Jul 2018 14:55:13 +0000 (22:55 +0800)]
Add python binding and sample for LSD
Alexander Alekhin [Wed, 18 Jul 2018 14:21:21 +0000 (14:21 +0000)]
Merge pull request #1693 from antonsh26:master
Anton Shutikhin [Tue, 17 Jul 2018 08:47:17 +0000 (11:47 +0300)]
Deletes misused buffer in BackgroundSubstractorGMG.
Alexander Alekhin [Wed, 18 Jul 2018 12:13:43 +0000 (12:13 +0000)]
Merge pull request #1695 from mshabunin:fix-text
Maksim Shabunin [Wed, 18 Jul 2018 08:39:56 +0000 (11:39 +0300)]
text: do not calculate mean for empty angles list
Alexander Alekhin [Tue, 17 Jul 2018 16:24:56 +0000 (19:24 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 17 Jul 2018 15:15:58 +0000 (15:15 +0000)]
Merge pull request #1692 from alalek:build_eliminate_gcc8_warnings
Alexander Alekhin [Mon, 16 Jul 2018 14:09:31 +0000 (17:09 +0300)]
build: eliminate GCC8 warnings
Alexander Alekhin [Wed, 11 Jul 2018 13:55:06 +0000 (16:55 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 11 Jul 2018 13:54:44 +0000 (13:54 +0000)]
Merge pull request #1688 from alalek:xfeatures2d_fix_nonfree_tests
Alexander Alekhin [Wed, 11 Jul 2018 13:32:53 +0000 (13:32 +0000)]
Merge pull request #1687 from alalek:fix_cuda_nonfree_build
Alexander Alekhin [Wed, 11 Jul 2018 12:52:32 +0000 (15:52 +0300)]
xfeatures2d(test): disable tests with required non-free code
Alexander Alekhin [Wed, 11 Jul 2018 12:35:03 +0000 (15:35 +0300)]
xfeatures2d: fix CUDA nonfree build
Alexander Alekhin [Mon, 9 Jul 2018 16:28:18 +0000 (19:28 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 9 Jul 2018 16:25:44 +0000 (16:25 +0000)]
Merge pull request #1685 from paroj:ovis_pp
Alexander Alekhin [Mon, 9 Jul 2018 15:46:01 +0000 (15:46 +0000)]
Merge pull request #1682 from berak:xfeatueres2d_nonfree
Pavel Rojtberg [Mon, 9 Jul 2018 15:37:03 +0000 (17:37 +0200)]
ovis: fix removing lights and cameras from scene
berak [Sat, 7 Jul 2018 09:00:49 +0000 (11:00 +0200)]
xfeatures2d: throw CV_Error if not built with OPENCV_ENABLE_NONFREE
Dietrich Büsching [Fri, 6 Jul 2018 20:39:41 +0000 (22:39 +0200)]
Merge pull request #1672 from dbuesching:rl_morphology
* run length morphology
* remove unused code, avoid warnings for undefined functions
* handle empty input in getBoundingRectangle correctly, remove unused operations
* changes according to code review
Alexander Alekhin [Thu, 5 Jul 2018 10:00:48 +0000 (10:00 +0000)]
Merge pull request #1662 from alalek:update_autobuffer_api
Alexander Alekhin [Mon, 2 Jul 2018 11:56:08 +0000 (14:56 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 2 Jul 2018 10:57:26 +0000 (10:57 +0000)]
Merge pull request #1679 from SongChiYoung:master
gmedan [Mon, 2 Jul 2018 10:53:39 +0000 (13:53 +0300)]
Merge pull request #1677 from gmedan:fix-charuco-topology
* fix #1665 ChAruco board topology (nearestMarkerIdx) is sensitive to scale
LaurentBerger [Mon, 2 Jul 2018 10:09:42 +0000 (12:09 +0200)]
Merge pull request #1678 from LaurentBerger:MoveAssert
* Some bugs in deriche and paillou filter
* Cv_Assert to CV_CheckType
SongChiYoung [Mon, 2 Jul 2018 08:55:34 +0000 (17:55 +0900)]
python3 compatible
Alexander Alekhin [Fri, 29 Jun 2018 16:29:06 +0000 (16:29 +0000)]
Merge pull request #1676 from paroj:ovis_pp
Pavel Rojtberg [Fri, 29 Jun 2018 15:19:39 +0000 (17:19 +0200)]
ovis: add setCompositors method
enables an ordered chain of full-screen post processing effects
Vadim Pisarevsky [Wed, 27 Jun 2018 07:26:37 +0000 (07:26 +0000)]
Merge pull request #1674 from criteo-forks:master
d.bouron [Mon, 25 Jun 2018 15:10:18 +0000 (17:10 +0200)]
Fix corruption exception in StaticSaliencySpectralResidual
In some case, Discrete Fourier Transform in computeSaliencyImpl() returns
magnitude matrix which contains zero values.
Then, log() returns -inf values and normalization with blur() returns -nan.
When computeBinaryMap() is called double free or corruption exception occurs
because kmeans() fails to compute distance.
Signed-off-by: d.bouron <d.bouron@criteo.com>
Vadim Pisarevsky [Mon, 25 Jun 2018 14:08:06 +0000 (14:08 +0000)]
Merge pull request #1669 from paroj:kinfupy
yarglawaldeg [Mon, 25 Jun 2018 13:21:50 +0000 (15:21 +0200)]
update structured_edge_detection (#1579)
* update structured_edge_detection
update structured_edge_detection to read models from updated p. dollar toolbox
* Update structured_edge_detection.cpp
* Update structured_edge_detection.cpp
casting size_t to int
Pavel Rojtberg [Thu, 21 Jun 2018 13:46:22 +0000 (15:46 +0200)]
kinfu: allow basic wrapping for bindings
for this
- move Params struct out of class
- use static create instead of pimpl
- allow demo to be compiled without VIZ
Rostislav Vasilikhin [Mon, 25 Jun 2018 11:09:39 +0000 (14:09 +0300)]
KinectFusion demo: live input support added (#1671)
* KinFu demo: added support for live demo, some bugs fixed
* minor fixes
* Kinect2 workarounds and defaults added
Alexander Alekhin [Sun, 10 Jun 2018 22:53:13 +0000 (22:53 +0000)]
opencv: use cv::AutoBuffer<>::data()
Alexander Alekhin [Mon, 4 Jun 2018 16:18:13 +0000 (19:18 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Colin [Mon, 4 Jun 2018 10:56:25 +0000 (18:56 +0800)]
Merge pull request #1652 from fallenlord:master
Bug fixes: using mask with BinaryDescriptor (#1652)
* Bug fixes: erasing an element from std::vector should not move iterator forward
* Bug fixes: add a NULL checking
* Remove the appoggio matrix generation, which is useless
Alexander Alekhin [Sat, 2 Jun 2018 20:45:00 +0000 (20:45 +0000)]
Merge pull request #1654 from terfendail:sparsedense_fix
Vitaly Tuzov [Thu, 31 May 2018 14:17:39 +0000 (17:17 +0300)]
Set initial inlier metric value to -FLT_MAX to ensure correctness of first iteration.
Vadim Pisarevsky [Thu, 31 May 2018 11:19:26 +0000 (11:19 +0000)]
Merge pull request #1648 from xkunglu:master
Rostislav Vasilikhin [Thu, 31 May 2018 11:18:25 +0000 (14:18 +0300)]
KinectFusion implemented (#1627)
* empty kinfu module created
* KinFu: skeleton is done
* some intermediate state fixed
* fixed normal calculation
* bilinear depth interp: fixing missing data
* TSDF integration optimized
* TSDF: adding constness
* utils: isNaN; Intr::Projector const reference fixed
* TSDF raycast: quality improvements
* TSDF fetchCloud is done
* render() added
* ICP implemented
* debug code moved to demo.cpp
* less TODOs
* partial refactoring
* TSDF: fetchPoints() and fetchNormals() rewritten in parallel manner
* platform choose added
* reordered
* data types isolated off the platform
* minor fixes
* ScopeTime added
* fixed iterations gathering
* volume::integrate() parallelized but works slow (big overhead for
* raycast is done in parallel
* got rid of kftype and p3type
* fetchNormals() fixed
* less code duplication
* nan check reduced, interpolate() refactored to fetchVoxel()
* ICP: optimizations
* TSDF: bilinear specialized
* TSDF: voxelSizeInv pushed away
* TSDF: interpolation optimized
* TSDF::integrate: parallel_for now works fast
* Frame::render: pow -> float ipow<int p>(x)
* ICP::getAb: parallel_for
* ICP::getAb: time print disabled
* ICP::getAb::bilinear: 2 calls joined
* refactored, extra functions removed
* optimized to use only 27 elems
* ICP::getAb: better optimized
* Points and Normals data type expanded to 4 channels
* ICP optimized (doesn't work)
* ICP::getAb is on intrinsics and it works
* NaN check is faster
* ICP::getAB: minors
* added non-SIMD code as fallback
* TSDF::fetchVoxel and interpolation: got rid of coord check
* TSDF::fetchVoxel: refactor
* TSDF::raycast: local copies of members
* TSDF::interpolate: refactored for simplier vectorization
* TSDF::getNormal: refactored for simplier vectorization
* minor
* include "intrin.hpp" moved to precomp.hpp
* TSDF::coords shifts moved to class body
* TSDF::getNormal vectorized
* TSDF::getNormal: little improvements
* TSDF::interpolate: little improvements
* TSDF::raycast vectorized
* more to precomp.hpp
* TSDF: minor optimizations
* TSDF::raycast cycles optimized
* TSDF::fetchPointsNormals instead of separate p and n
* TSDF::bilinearInterpolate: little speedup
* TSDF::interpolate: speed up
* TSDF::interpolate: more compact code
* TSDF::getNormal and raycast main cycle made faster
* ICP: few improvements
* Frame: a lot of parts parallelized
* TSDF::fetchPointsNormals minor improvements
* TSDF::integrate and bilinear vectorized
* TSDF::interpolate and getNormal: interpolation vectorized
* ICP: minor changes
* gradientDeltaFactor removed, coarseParams() added
* TSDF::raycast: fixed bug with tmin/tmax
* minors
* baseZ fixed
* ICP: interpolation fixed, non-parallelized code fixed
* TSDF::interpolate: bilinear fixed, less artifacts
* TSDF: minor refactoring
* TSDF: some members moved to parent class
* added tests for KinFu
* KinFu documented
* docs fixed
* warnings fixed
* license added, overrides added
* minors
* ScopeTime moved to separate file
* less memory allocations
* demo improved, java binding disabled
* viz module made optional
* fix to demo
* frameGenerator interface: got rid of refs to cv::Ptr
* demo made interactive
* trying to fix build
* trying to fix warnings
* warning fixed
* demo fixed
* raycast_step_factor tuned
* legal info added
* don't reset if ICP failed
* refactoring: KinFu::operator() => update()
* KinFu::KinFuParams => ::Params
* get/setParams
* fetch => get
* all src moved to cv::kinfu namespace
* struct Intr made internal
* kinfu_module merged into rgbd module
* License preambule updated
* minors
* frame.* renamed to kinfu_frame.*
* warnings fixed
* more warnings fixed
* RGBD normals: a fix against Inf/Nan values
* FastICP: fixed transformation direction
* RGBD Odometry tests: added epsilon for id transform; minors
* RGBD Odometry tests enabled
* modules list fixed
Unknown [Tue, 22 May 2018 00:57:07 +0000 (17:57 -0700)]
minor fix to allow learn_color_balance.py to work with python 3+
map object returns an iterator, not a list, in python 3.
fix: list(map()) is still compatible with python 2
Alexander Alekhin [Mon, 21 May 2018 13:18:14 +0000 (16:18 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 21 May 2018 13:11:11 +0000 (13:11 +0000)]
Merge pull request #1645 from krshrimali:patch-1
Alexander Alekhin [Mon, 21 May 2018 10:00:50 +0000 (10:00 +0000)]
Merge pull request #1644 from alalek:build_warnings
Kushashwa Ravi Shrimali [Mon, 21 May 2018 08:30:20 +0000 (14:00 +0530)]
Check if faces detected or not.
Added if condition, whether faces are detected or not, will help to keep program running for some images.
If imwrite used along with imshow, it may produce error for : No faces found.Aborting.. in function 'fit' (Bad Argument).
LaurentBerger [Thu, 17 May 2018 16:37:57 +0000 (18:37 +0200)]
Merge pull request #1634 from LaurentBerger:FD_bug
* remove bug when src is vector Point2i in FourierDescriptors
* remove unused code and comments
Alexander Alekhin [Thu, 17 May 2018 15:41:55 +0000 (18:41 +0300)]
eliminate build warnings / fix bug in text module
Alexander Alekhin [Tue, 15 May 2018 19:28:40 +0000 (19:28 +0000)]
Merge pull request #1642 from fegorsch:rename-near-to-znear
Alexander Alekhin [Tue, 15 May 2018 19:27:14 +0000 (19:27 +0000)]
Merge pull request #1640 from terfendail:disflow_fix
Alexander Alekhin [Tue, 15 May 2018 19:23:41 +0000 (19:23 +0000)]
Merge pull request #1637 from catree:add_apriltag_dictionaries
fegorsch [Tue, 15 May 2018 13:43:15 +0000 (15:43 +0200)]
Rename `near` to `zNear`
`near` is an illegal variable name on Windows (if `windef.h` is included),
because a macro with the same name is defined.
Someone else already put your rage into words, see
http://lolengine.net/blog/2011/3/4/fuck-you-microsoft-near-far-macros.
Vitaly Tuzov [Fri, 11 May 2018 15:08:18 +0000 (18:08 +0300)]
Fixed coarse scale evaluation for DIS optical flow estimator
catree [Wed, 9 May 2018 03:41:04 +0000 (05:41 +0200)]
Add AprilTag dictionaries to be able to detect AprilTag markers. Add ArUco and AprilTag 2 citations.
Alexander Alekhin [Thu, 10 May 2018 15:12:09 +0000 (18:12 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 8 May 2018 17:48:50 +0000 (17:48 +0000)]
Merge pull request #1635 from catree:fix_aruco_apriltag_corner_memory_leak
catree [Fri, 4 May 2018 18:06:37 +0000 (20:06 +0200)]
Fix memory leak when using CORNER_REFINE_APRILTAG.
Alexander Alekhin [Sat, 28 Apr 2018 15:01:45 +0000 (18:01 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 28 Apr 2018 14:12:12 +0000 (14:12 +0000)]
Merge pull request #1629 from alalek:cleanup_unnecessary_setNumThreads
Alexander Alekhin [Sat, 28 Apr 2018 11:53:50 +0000 (14:53 +0300)]
cleanup unnecessary setNumThreads() calls
Alexander Alekhin [Wed, 25 Apr 2018 19:41:40 +0000 (19:41 +0000)]
Merge pull request #1624 from paroj:ovisup
Alexander Alekhin [Wed, 25 Apr 2018 19:41:16 +0000 (22:41 +0300)]
Merge pull request #1623 from alalek:android_pack_fix_contrib
* android: fix build warnings
* build: fix warnings
Pavel Rojtberg [Wed, 25 Apr 2018 15:10:56 +0000 (17:10 +0200)]
ovis: remove superficial '}' from cmake
with Ogre 1.11 OGRE_INCLUDE_DIRS has only one element and the '}'
corrupting the last include path becomes noticable.
Alexander Alekhin [Tue, 24 Apr 2018 15:13:01 +0000 (18:13 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 24 Apr 2018 15:03:53 +0000 (15:03 +0000)]
Merge pull request #1621 from alalek:replace_cv_errornoreturn
Alexander Alekhin [Tue, 24 Apr 2018 12:10:23 +0000 (15:10 +0300)]
build: fix warnings
Alexander Alekhin [Tue, 24 Apr 2018 11:16:39 +0000 (14:16 +0300)]
build: unreachable code after CV_Error()
Alexander Alekhin [Mon, 23 Apr 2018 16:26:53 +0000 (19:26 +0300)]
refactor: don't use CV_ErrorNoReturn() internally
Alexander Alekhin [Mon, 23 Apr 2018 13:48:40 +0000 (16:48 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Vadim Pisarevsky [Mon, 23 Apr 2018 10:25:23 +0000 (10:25 +0000)]
Merge pull request #1617 from alalek:drop_dnn_modern
Alexander Alekhin [Fri, 20 Apr 2018 09:50:03 +0000 (12:50 +0300)]
cleanup: drop dnn_modern
- almost all functionality of this module is covered by OpenCV dnn module
- module build has been broken for the long time due strong conflict with OpenCV dnn module
- requires external tinydnn library
- there are no tests
Alexander Alekhin [Wed, 18 Apr 2018 10:28:13 +0000 (10:28 +0000)]
Merge pull request #1613 from alalek:issue_1610
Alexander Alekhin [Tue, 17 Apr 2018 09:47:45 +0000 (09:47 +0000)]
Merge pull request #1615 from berak:face_fix_lbf
berak [Tue, 17 Apr 2018 05:48:32 +0000 (07:48 +0200)]
face: fix missing faceDetectorData arg in facemarkLBF.cpp
Alexander Alekhin [Mon, 16 Apr 2018 12:42:05 +0000 (15:42 +0300)]
ximgproc: fix weightedMedianFilter() hang
- eliminated "float th = 1e-5f" magic value (replaced to explicit checks)
- eliminate manual memory allocation
- avoid out of range access (i == alls)
Alexander Alekhin [Mon, 16 Apr 2018 10:40:45 +0000 (13:40 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 11 Apr 2018 15:50:13 +0000 (15:50 +0000)]
Merge pull request #1606 from paroj:lmpy
Pavel Rojtberg [Wed, 11 Apr 2018 14:30:53 +0000 (16:30 +0200)]
linemod: export Template::features for python
Alexander Alekhin [Tue, 10 Apr 2018 09:33:45 +0000 (09:33 +0000)]
Merge pull request #1605 from berak:face_deps
berak [Tue, 10 Apr 2018 08:54:29 +0000 (10:54 +0200)]
face: fix dependancies
Alexander Alekhin [Mon, 9 Apr 2018 15:55:45 +0000 (15:55 +0000)]
Merge pull request #1604 from mshabunin:decrease-tbb-dependency
Alexander Alekhin [Mon, 9 Apr 2018 15:08:29 +0000 (15:08 +0000)]
Merge pull request #1602 from terfendail:graycodepat_py
Maksim Shabunin [Fri, 6 Apr 2018 12:14:52 +0000 (15:14 +0300)]
Cleanup old TBB-related guards
Vitaly Tuzov [Tue, 3 Apr 2018 15:32:33 +0000 (18:32 +0300)]
Make getProjPixel output value available in python bindings
Alexander Alekhin [Sat, 31 Mar 2018 12:27:20 +0000 (15:27 +0300)]
Merge pull request #1599 from dkurt:torch_embedded_residuals
Add CV_OVERRIDE
Dmitry Kurtaev [Sat, 31 Mar 2018 11:09:29 +0000 (14:09 +0300)]
Add CV_OVERRIDE
Alexander Alekhin [Sat, 31 Mar 2018 10:07:34 +0000 (10:07 +0000)]
Merge pull request #1597 from LaurentBerger:edgeboxes
LaurentBerger [Fri, 30 Mar 2018 19:41:39 +0000 (21:41 +0200)]
solves #1596
Alexander Alekhin [Fri, 30 Mar 2018 15:27:32 +0000 (15:27 +0000)]
Merge pull request #1593 from paroj:ovisup
Alexander Alekhin [Fri, 30 Mar 2018 15:22:46 +0000 (15:22 +0000)]
Merge pull request #1592 from berak:landmarks
Alexander Alekhin [Thu, 29 Mar 2018 14:50:05 +0000 (14:50 +0000)]
Merge pull request #1594 from mshabunin:fix-clang-warnings
Pavel Rojtberg [Thu, 29 Mar 2018 12:10:29 +0000 (14:10 +0200)]
ovis: ar_sample - update scene to correct CS conventions
Pavel Rojtberg [Thu, 29 Mar 2018 12:06:57 +0000 (14:06 +0200)]
ovis: use fix camera yaw axis to -y by default
also remove superficial CS conversion in fixCameraYawAxis
Pavel Rojtberg [Thu, 29 Mar 2018 10:45:11 +0000 (12:45 +0200)]
ovis: fix plane mesh coordinate system to match OpenCV
Pavel Rojtberg [Thu, 29 Mar 2018 10:40:37 +0000 (12:40 +0200)]
ovis: fix camera entity positioning
Pavel Rojtberg [Tue, 27 Mar 2018 15:52:16 +0000 (17:52 +0200)]
ovis: correct and simplify coordinate system conversions
by keeping Camera oriented in OpenCV conventions instead of doing the
conversion for each SceneNode.
Maksim Shabunin [Thu, 29 Mar 2018 10:26:11 +0000 (13:26 +0300)]
Fixed several warnings produced by clang