Alexander Alekhin
402956703c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
7 years ago
Alexander Alekhin
abb211d064
avoid `Ptr<> == NULL` checks
7 years ago
Suleyman TURKMEN
fa80a87aea
Update pd_inria.cpp
7 years ago
Alexander Alekhin
45f9d57118
matlab: fix conversion functions
7 years ago
Alexander Alekhin
a1815ca8f3
Merge pull request #1758 from paroj:ovis_texup
7 years ago
Alexander Alekhin
5c36296895
Merge pull request #1759 from alalek:fix_contrib_1754
7 years ago
Alexander Alekhin
9312f74540
xfeatures2d(test): update GMS test thresholds
7 years ago
Alexander Alekhin
0bf687bc33
xfeatures2d(test): update extraction/invariance tests
7 years ago
Pavel Rojtberg
c64f925a50
ovis: Camera - allow manually setting zNear and zFar
7 years ago
Alexander Alekhin
34f2e6e5ef
Merge pull request #1756 from cv3d:lint_unused
7 years ago
Hamdi Sahloul
c880b7ea4d
Utilize CV_UNUSED macro
7 years ago
Alexander Alekhin
a2eae86c15
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
7 years ago
Alexander Alekhin
8849e0780c
Merge pull request #1752 from alalek:c_api_eliminate_constructors
7 years ago
Alexander Alekhin
3094b94850
Merge pull request #1753 from alalek:fix_face_32bit
7 years ago
Alexander Alekhin
8378dc6b9d
Merge pull request #1751 from vpisarev:avx2_fixes
7 years ago
Alexander Alekhin
96a7fdf35f
face: fix I/O for 'splitr' structure on 32-bit platforms
7 years ago
Alexander Alekhin
064603ad9b
Merge pull request #1748 from paroj:ovis_texup
7 years ago
Alexander Alekhin
21d5949e83
fix build
7 years ago
Vadim Pisarevsky
d1b8e38e45
trying to fix the custom AVX2 builder test failures (false alarms)
7 years ago
Alexander Alekhin
99573cb928
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
7 years ago
Pavel Rojtberg
f9bef18444
ovis: ensure that compositors are applied to all owned render targets
7 years ago
Alexander Alekhin
386f52c7d6
Merge pull request #1747 from alalek:fix_contrib_1746
7 years ago
Alexander Alekhin
f71329637f
face: update FacemarkAAMImpl::delaunay() implementation
...
according new behavior of SubDiv2D
7 years ago
Alexander Alekhin
b516c2885f
Merge pull request #1734 from cv3d:improvements/binding_python
7 years ago
Alexander Alekhin
e29fc6b759
Merge pull request #1737 from sturkmen72:update_TrackerCSRT
7 years ago
Alexander Alekhin
e993e8c014
Merge pull request #1739 from alalek:cleanup_stl_string_replacement
7 years ago
Alexander Alekhin
16daec9c5c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
7 years ago
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()
7 years ago
Alexander Alekhin
2b4c35766a
hdf5: fix atread(string)
...
no need to append null-terminated symbol
7 years ago
Hamdi Sahloul
8e840c8642
Fix enum wrapper
7 years ago
Suleyman TURKMEN
d11ab6859f
update TrackerCSRT
7 years ago
Vladislav Sovrasov
b7fa9697f6
text: remove duplicated create method in OCRHMMDecoder class
7 years ago
Alexander Alekhin
1070e7042a
Merge pull request #1733 from cv3d:minor/umat_getmat_access
7 years ago
Hamdi Sahloul
271f2bcf86
UMat::getMat(): Utilize `ACCESS_READ` instead of 0
7 years ago
Alexander Alekhin
5d3928e4f5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
7 years ago
Alexander Alekhin
97878da58b
Merge pull request #1732 from alalek:fix_debug_build
7 years ago
Alexander Alekhin
2203743cd0
aruco: fix debug build
7 years ago
Alexander Alekhin
645ca12d1d
Merge pull request #1729 from alalek:fix_ovis_build
7 years ago
Alexander Alekhin
8014fda86b
Merge pull request #1727 from kushalvyas:rdf_refactor1
7 years ago
Alexander Alekhin
21f7139e51
ovis: fix build
7 years ago
Alexander Alekhin
1404ce97ae
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
7 years ago
bini
1612d99c81
refactored include and bib files
7 years ago
Alexander Alekhin
673900a84c
Merge pull request #1724 from hrnr:video_remove_ransac
7 years ago
Alexander Alekhin
39120af349
Merge pull request #1722 from alalek:fix_assert_messages
7 years ago
Alexander Alekhin
dc6af711a7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
7 years ago
Jiri Horner
09c5e8cc81
replace internal usage of deprecated estimateRigidTransform in face
...
* face module now links to calib3d instead of video module
7 years ago
Alexander Alekhin
89a7e84178
Merge pull request #1715 from jbeich:clang
7 years ago
Alexander Alekhin
8277ca6aae
opencv-core: avoid using of multi-argument CV_Assert()
...
replace to CV_Assert_N()
7 years ago
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__ )
^~~~
7 years ago
Alexander Alekhin
9adf7a58a0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
7 years ago