Maksim Shabunin
9333f82be0
Reduce dependencies between modules
2017-03-15 17:58:52 +03:00
Fangjun KUANG
246d3761ce
Merge pull request #8383 from csukuangfj/patch-10
...
* Improve documentation.
* Update imgproc.hpp
2017-03-15 11:12:59 +00:00
Naba Kumar
27cf6e549e
Merge pull request #8367 from khnaba:cuda-calchist-with-mask
...
Implement cv::cuda::calcHist with mask support (#8367 )
* Implement cuda::calcHist with mask
* Fix documentation build warning
* Have their own step sizes for src and mask. Fix review comment.
2017-03-15 09:34:00 +00:00
Maksim Shabunin
a83a1cafa7
Merge pull request #8388 from ottogin:calib3d
2017-03-15 04:33:33 +00:00
Artem Lukoyanov
3bf5d34544
Callib3d 4channel image detection
...
3.2 version doesn't support 4 channel color image
detections, unlike 3.1. Now, we don't call
CV_Error() if 4 channel image is given.
resolve #8326
2017-03-15 02:54:15 +03:00
Alexander Alekhin
73e9c44377
Merge pull request #8370 from csukuangfj:patch-7
2017-03-14 13:32:35 +00:00
Alexander Alekhin
661f3e2160
Merge pull request #8371 from csukuangfj:patch-8
2017-03-14 13:23:02 +00:00
Alexander Alekhin
6fcb07d41e
Merge pull request #8375 from Sahloul:fixes/matx/init
2017-03-14 13:22:26 +00:00
Alexander Alekhin
54f7ebdec9
Merge pull request #8380 from csukuangfj:patch-9
2017-03-14 13:20:52 +00:00
Hamdi Sahloul
171e705ba4
Fixes the constructor of 1x14, 2x7, 7x2 or 14x1 matrix
2017-03-14 18:26:22 +09:00
Fangjun KUANG
3ad6d13ff3
Fix an error in the documentation.
2017-03-14 09:57:37 +01:00
hailong-wang
207218e920
Fix the bug of Mat_<>::opeartor []
...
`template<typename _Tp> inline const _Tp* Mat_<_Tp>::operator [](int y) const` does not support 3d matrix since it checks rows.
This operator[] shall check size.p[0] instead.
2017-03-14 13:02:59 +08:00
Fangjun KUANG
31cc519cd3
fix typos.
2017-03-13 13:51:22 +01:00
Fangjun KUANG
3c15913f53
Impove the documentation for Mat::diag
2017-03-13 12:46:50 +01:00
Alexander Alekhin
502aa1f053
Merge pull request #8368 from csukuangfj:patch-5
2017-03-13 10:15:30 +00:00
Alexander Alekhin
fdda19cb0c
Merge pull request #8356 from csukuangfj:patch-1
2017-03-13 09:59:16 +00:00
Fangjun KUANG
95468b72f3
Fix typos in the documentation for cv::Mat.
2017-03-13 10:20:41 +01:00
KUANG, Fangjun
debc1c4c95
fix an error while setting kernel argument for a 3-D matrix.
2017-03-12 18:29:49 +01:00
Alexander Alekhin
08c6ffaa8d
Merge pull request #8346 from Sahloul:fixes/python_wrapper/flann
2017-03-10 20:01:54 +00:00
Fangjun KUANG
2a30d8c9f9
Update documentation for cv::accumulate.
...
Make it more clear for the type of input argument.
2017-03-10 17:53:12 +01:00
Hamdi Sahloul
db52841544
Accept default argument of FLANN index parameters
2017-03-10 22:09:31 +09:00
Alexander Alekhin
e4377e7c51
Merge pull request #8335 from kuanyili:typo-patch
2017-03-09 10:43:00 +00:00
Alexander Alekhin
8ef23d64a1
Merge pull request #8308 from sovrasov:fs_dmatch_kpts_update
2017-03-07 19:28:34 +00:00
Kuan-Yi Li
e685dcef0b
Fix typos
2017-03-07 23:42:24 +08:00
Vadim Pisarevsky
24efb02d93
Merge pull request #8332 from sovrasov:qt_no_dbg_output_in_release
2017-03-07 14:39:44 +00:00
Vadim Pisarevsky
e832870288
Merge pull request #8333 from sovrasov:ml_svm_params_scope_fix
2017-03-07 14:38:10 +00:00
Vladislav Sovrasov
195c12f2db
ml: remove useless namespace identifiers in SVM
2017-03-07 16:02:19 +03:00
Vladislav Sovrasov
cd7f0a5177
QT: disable debug output in Release mode
2017-03-07 15:41:07 +03:00
Alexander Alekhin
6b1d9971f4
Merge pull request #8313 from alalek:ocl_fix_cvtcolor
2017-03-07 11:29:01 +00:00
Alexander Alekhin
f9f013e264
Merge pull request #8323 from csukuangfj:csukuangfj-patch-8
2017-03-07 11:24:19 +00:00
Alexander Alekhin
6fe1898ab6
Merge pull request #8294 from alalek:fix_stitching_failure
2017-03-06 14:55:23 +00:00
Alexander Alekhin
990e87effb
Merge pull request #8111 from utibenkei:saliency-module-java
2017-03-06 14:39:23 +00:00
Fangjun KUANG
8a679128fa
Update comments for cv::InputArray.
2017-03-06 14:45:30 +01:00
Alexander Alekhin
3e2b05b096
Merge pull request #8274 from abratchik:mser.brisk.3.0.0-rc1
2017-03-06 10:22:29 +00:00
Alexander Alekhin
aa5204958e
Merge pull request #8279 from sovrasov:calib3d_new_recover_pose
2017-03-06 10:20:43 +00:00
Alexander Alekhin
92c4b6ae4c
Merge pull request #8298 from delftrobotics-forks:circles-grid-parameters
2017-03-05 10:17:51 +00:00
Alexander Alekhin
ba8a6e3533
ocl: don't use vload4 for 3 channel images
2017-03-03 19:36:38 +03:00
Philipp Hasper
ec38ef9b10
CameraBridgeViewBase synchronizes on a final field
...
Synchronizing against non-final fields is advised against.
2017-03-03 16:07:10 +01:00
Jose Gómez
6f39f9a6a0
Merge pull request #8168 from jmgomezpoveda:issue_8166
...
* Use the YV12 format in the Android emulator to avoid image issues
* Removed trailing spaces
* Added exception in else case
* Removed tab
2017-03-03 13:44:11 +00:00
Vladislav Sovrasov
931b32d102
core: add single DMatch/Keypoint I/O
2017-03-03 13:58:55 +03:00
Alexander Alekhin
89ce2dc405
core: DMatch I/O tests
2017-03-03 13:55:27 +03:00
Alexander Alekhin
5d31d6ebbb
Merge pull request #8306 from chacha21:portability
2017-03-03 04:46:05 +00:00
chacha21
74abbd0898
Fix compilation when USE_ZLIB is false
...
create a dummy gzFile type
2017-03-02 16:58:51 +01:00
chacha21
aa1b031274
get rid of warning C4800 under VS2010
...
the "std::basic_ios::operator bool" differs between C++98 and C++11. The
"double not" syntax is portable and covers both cases with equivalent
meaning
2017-03-02 16:56:20 +01:00
Vadim Pisarevsky
b46364e436
Merge pull request #7996 from mshabunin:hal-filter-revert
2017-03-02 11:12:08 +00:00
Vadim Pisarevsky
e0ee2f769a
Merge pull request #8116 from mrquorr:master
2017-03-02 11:07:23 +00:00
Alexander Alekhin
e65c6270bf
stitching(perf): workaround test failures
...
force other RNG seed
2017-03-02 13:45:12 +03:00
Alexander Alekhin
147f3ebf0a
flann: use OpenCV theRNG()
...
std::rand() has no thread-safe guarantee.
2017-03-02 13:45:12 +03:00
Alexander Alekhin
53e685461e
stitching: force "stable" RNG
2017-03-02 13:45:12 +03:00
Hans Gaiser
11b24eb49f
Expose CirclesGridFinderParameters in findCirclesGrid.
2017-03-02 10:53:45 +01:00
