1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-22 07:31:26 +08:00
Commit Graph

2900 Commits

Author SHA1 Message Date
gdemarcq
1f6d6f0626 Merge pull request #1736 from gdemarcq:staticSaliencyFineGrained_corrections
* Correction for computeBinaryMap crash:
- the function staticSaliencyFineGrained::computeSaliency() outputs a
normalized floating point image
- Add an assert in StaticSaliency::computeBinaryMap in order to check
image depth (must be CV_32F)

* - Change assert in cv::Saliency::StaticSaliency::computeBinaryMap()
- Change normalization factor in cv::Saliency::StaticSaliencyFineGrained::computeSaliencyImpl()
3.4.3
2018-08-28 15:47:17 +03:00
Alexander Alekhin
1070e7042a Merge pull request #1733 from cv3d:minor/umat_getmat_access 2018-08-24 06:45:02 +00:00
Hamdi Sahloul
271f2bcf86 UMat::getMat(): Utilize ACCESS_READ instead of 0 2018-08-24 06:03:39 +09:00
Alexander Alekhin
97878da58b Merge pull request #1732 from alalek:fix_debug_build 2018-08-23 19:29:35 +00:00
Alexander Alekhin
2203743cd0 aruco: fix debug build 2018-08-23 19:03:25 +03:00
Alexander Alekhin
645ca12d1d Merge pull request #1729 from alalek:fix_ovis_build 2018-08-23 11:33:49 +00:00
Alexander Alekhin
8014fda86b Merge pull request #1727 from kushalvyas:rdf_refactor1 2018-08-23 11:32:59 +00:00
Alexander Alekhin
21f7139e51 ovis: fix build 2018-08-23 07:26:21 +00:00
bini
1612d99c81 refactored include and bib files 2018-08-22 02:35:42 -04:00
Alexander Alekhin
39120af349 Merge pull request #1722 from alalek:fix_assert_messages 2018-08-21 13:45:03 +00:00
Alexander Alekhin
89a7e84178 Merge pull request #1715 from jbeich:clang 2018-08-15 18:45:05 +00:00
Alexander Alekhin
8277ca6aae opencv-core: avoid using of multi-argument CV_Assert()
replace to CV_Assert_N()
2018-08-15 17:39:00 +03:00
Jan Beich
4e10bc5dae stereo: unbreak with clang 7
modules/stereo/src/descriptor.cpp:229:34: error: ordered comparison between pointer and zero ('const int *' and 'int')
	     CV_Assert(image.size > 0);
		       ~~~~~~~~~~ ^ ~
 modules/core/include/opencv2/core/base.hpp:478:84: note: expanded from macro 'CV_Assert'
 #define CV_Assert(...) do { CVAUX_CONCAT(CV_Assert_, CV_VA_NUM_ARGS(__VA_ARGS__)) (__VA_ARGS__); } while(0)
										    ^~~~~~~~~~~
 modules/core/include/opencv2/core/base.hpp:455:35: note: expanded from macro 'CV_Assert_1'
 #define CV_Assert_1( expr ) if(!!(expr)) ; else cv::error( cv::Error::StsAssert, #expr, CV_Func, __FILE__, __LINE__ )
				   ^~~~
 modules/stereo/src/descriptor.cpp:230:33: error: ordered comparison between pointer and zero ('const int *' and 'int')
	     CV_Assert(cost.size > 0);
		       ~~~~~~~~~ ^ ~
 modules/core/include/opencv2/core/base.hpp:478:84: note: expanded from macro 'CV_Assert'
 #define CV_Assert(...) do { CVAUX_CONCAT(CV_Assert_, CV_VA_NUM_ARGS(__VA_ARGS__)) (__VA_ARGS__); } while(0)
										    ^~~~~~~~~~~
 modules/core/include/opencv2/core/base.hpp:455:35: note: expanded from macro 'CV_Assert_1'
 #define CV_Assert_1( expr ) if(!!(expr)) ; else cv::error( cv::Error::StsAssert, #expr, CV_Func, __FILE__, __LINE__ )
				   ^~~~
2018-08-15 14:10:22 +03:00
Alexander Alekhin
f368d83f93 Merge pull request #1717 from alalek:replace_bigendian_check 2018-08-13 15:56:26 +00:00
Alexander Alekhin
acad7bbee5 build: replace big/little endianess check to WORDS_BIGENDIAN macro 2018-08-12 21:52:41 +00:00
Alexander Alekhin
fc1aeac93e Merge pull request #1716 from trobro:optflow-flann 2018-08-09 20:47:31 +00:00
Alexander Alekhin
ff9a1842f5 Merge pull request #1714 from paroj:ovis_texup 2018-08-09 20:43:10 +00:00
trobro
ac7d1ca613 optflow: is depending on opencv_flann 2018-08-09 22:06:13 +02:00
Pavel Rojtberg
c655c31054 ovis: allow up to 4 active texture units 2018-08-09 15:48:03 +02:00
Pavel Rojtberg
f7e522a1cb ovis: add updateTexture function and allow grayscale texture format 2018-08-09 15:48:03 +02:00
LaurentBerger
a83b78e29a Merge pull request #1709 from LaurentBerger/BM3D_STEPALL
* Process InputOutputArray when BM3D_STEPALL is set

* Step1 created if needed- noArray in test
2018-08-03 21:57:52 +03:00
Alexander Alekhin
e38c55057a Merge pull request #1696 from bill2239:fix_densecensus 2018-07-24 15:15:10 +00:00
Li-Chi Huang
e2ad4e8bb4 fix densecensus when compute 2018-07-24 16:42:25 +03:00
Alexander Alekhin
8292bb224c Merge pull request #1697 from dianlujitao:3.4 2018-07-23 12:20:22 +00:00
dianlujitao
e396a67038 Add python binding and sample for LSD 2018-07-23 16:05:55 +08:00
Alexander Alekhin
67283690bf Merge pull request #1693 from antonsh26:master 2018-07-18 14:21:21 +00:00
Anton Shutikhin
f4250cae59 Deletes misused buffer in BackgroundSubstractorGMG. 2018-07-18 15:36:54 +03:00
Alexander Alekhin
17e939fa98 Merge pull request #1695 from mshabunin:fix-text 2018-07-18 12:13:44 +00:00
Maksim Shabunin
d7ca0bde0b text: do not calculate mean for empty angles list 2018-07-18 11:40:38 +03:00
Alexander Alekhin
db3d7e85b8 Merge pull request #1692 from alalek:build_eliminate_gcc8_warnings 2018-07-17 15:15:58 +00:00
Alexander Alekhin
b9d83609de build: eliminate GCC8 warnings 2018-07-16 17:21:45 +03:00
Alexander Alekhin
e7aa0aa2d4 Merge pull request #1688 from alalek:xfeatures2d_fix_nonfree_tests 2018-07-11 13:54:44 +00:00
Alexander Alekhin
86a6737202 Merge pull request #1687 from alalek:fix_cuda_nonfree_build 2018-07-11 13:32:53 +00:00
Alexander Alekhin
0a8d930341 xfeatures2d(test): disable tests with required non-free code 2018-07-11 16:12:37 +03:00
Alexander Alekhin
d3b03808db xfeatures2d: fix CUDA nonfree build 2018-07-11 15:35:03 +03:00
Alexander Alekhin
1e096c6c01 Merge pull request #1685 from paroj:ovis_pp 2018-07-09 16:25:44 +00:00
Alexander Alekhin
1c105ce8d8 Merge pull request #1682 from berak:xfeatueres2d_nonfree 2018-07-09 15:46:01 +00:00
Pavel Rojtberg
77f1d272b6 ovis: fix removing lights and cameras from scene 2018-07-09 17:37:14 +02:00
berak
c871e23d18 xfeatures2d: throw CV_Error if not built with OPENCV_ENABLE_NONFREE 2018-07-07 12:06:23 +02:00
Alexander Alekhin
bcddb16e2a Merge pull request #1662 from alalek:update_autobuffer_api 2018-07-05 10:00:48 +00:00
Alexander Alekhin
d4e0286945 Merge pull request #1679 from SongChiYoung:master 3.4.2 2018-07-02 10:57:26 +00:00
gmedan
02b991a433 Merge pull request #1677 from gmedan:fix-charuco-topology
* fix #1665 ChAruco board topology (nearestMarkerIdx) is sensitive to scale
2018-07-02 13:53:39 +03:00
LaurentBerger
2bd8d58513 Merge pull request #1678 from LaurentBerger:MoveAssert
* Some bugs in deriche and paillou filter

* Cv_Assert to CV_CheckType
2018-07-02 13:09:42 +03:00
SongChiYoung
edd4514e54 python3 compatible 2018-07-02 17:55:34 +09:00
Alexander Alekhin
c6daea8d85 Merge pull request #1676 from paroj:ovis_pp 2018-06-29 16:29:07 +00:00
Pavel Rojtberg
4f3c9fcb5a ovis: add setCompositors method
enables an ordered chain of full-screen post processing effects
2018-06-29 17:19:52 +02:00
Alexander Alekhin
fc69aa57bc opencv: use cv::AutoBuffer<>::data() 2018-06-13 19:11:18 +00:00
Colin
25a01dc4ef 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
2018-06-04 10:56:25 +00:00
Alexander Alekhin
db1d5e153c Merge pull request #1654 from terfendail:sparsedense_fix 2018-06-02 20:45:00 +00:00
Vitaly Tuzov
0ba26b31df Set initial inlier metric value to -FLT_MAX to ensure correctness of first iteration. 2018-05-31 17:17:39 +03:00