Commit Graph

21077 Commits

Author SHA1 Message Date
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
Alexander Alekhin
5ea5d08892 Merge pull request #8365 from csukuangfj:patch-3 2017-03-13 09:51:21 +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
KUANG, Fangjun
be7d4608fb Add more comments to the members of CoreTLSData related to OpenCL. 2017-03-12 16:13:00 +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
Vadim Pisarevsky
da0188acc0 Merge pull request #8245 from oulenz:patch-1 2017-03-10 14:30:09 +00:00
Hamdi Sahloul
db52841544 Accept default argument of FLANN index parameters 2017-03-10 22:09:31 +09:00
Christof Kaufmann
583e3a6875 cmake: Avoid adding default path as system directory for GCC 6.x
This is a completion for PR #7390 and fixes #6517 and #815.
2017-03-09 16:23:53 +01:00
Alexander Alekhin
e4377e7c51 Merge pull request #8335 from kuanyili:typo-patch 2017-03-09 10:43:00 +00:00
Matthias Grundmann
0a1767a6b5 Update bgfg_gaussmix2.cpp to avoid divide by zero cases. 2017-03-08 19:27:43 -08: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
9d593e7779 Merge pull request #8324 from sturkmen72:update_objectDetection_cpp 2017-03-07 09:39:02 +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
Alexander Alekhin
55ff28ed93 Merge pull request #8321 from sergboec:patch-1 2017-03-06 14:23:13 +00:00
Suleyman TURKMEN
50bda8adfe Update objectDetection.cpp 2017-03-06 16:51:29 +03:00
Fangjun KUANG
8a679128fa Update comments for cv::InputArray. 2017-03-06 14:45:30 +01:00
Sergey
f743c82bdd Updated OpenCVFindMKL.cmake
Current version of search for MLKROOT environment variable is wrong and should be corrected to (DEFINED ENV{MKLROOT})
2017-03-06 15:28:05 +03: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
459a2bbc9e Merge pull request #8316 from xuning0:xuning0-patch-1 2017-03-06 10:17:51 +00:00
xuning0
8c93b61e2c Fix the description of ROI 2017-03-05 22:47:49 +08:00
Alexander Alekhin
92c4b6ae4c Merge pull request #8298 from delftrobotics-forks:circles-grid-parameters 2017-03-05 10:17:51 +00:00
Alexander Alekhin
eb6279d6ff Merge pull request #8310 from PhilLab:patch-1 2017-03-05 09:46:43 +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
9a92777fc1 Merge pull request #8207 from StevenPuttemans:fix_timing_traincascade 2017-03-03 10:14:18 +00:00
StevenPuttemans
db7922b9ee fix timing of traincascade 2017-03-03 10:06:35 +01: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
8e8da3f5b0 Merge pull request #8282 from vskarlsruhe:patch-3 2017-03-02 11:18:26 +00:00
Vadim Pisarevsky
d00561d396 Merge pull request #8217 from terfendail:ovx_halheader 2017-03-02 11:17:54 +00: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