Commit Graph

15338 Commits

Author SHA1 Message Date
Daniel Sjölie
a9a45e1546 Merge remote-tracking branch 'upstream/master' into daniel 2014-11-14 13:44:06 +01:00
Dmitriy Anisimov
28944336d4 updated linux installation documentation 2014-11-14 12:32:42 +03:00
Vadim Pisarevsky
4b97e8c51c Merge pull request #3399 from mshabunin:doxygen-core 2014-11-13 07:25:27 +00:00
Vadim Pisarevsky
d4db7807df Merge pull request #3415 from jet47:fix-gpu-perf-sample 2014-11-13 07:21:02 +00:00
Alexander Alekhin
a16a11f32b Merge pull request #3413 from wangyan42164:denoising_opencl_improvement 2014-11-13 01:47:01 +00:00
Vladislav Vinogradov
1189606cd8 fix gpu performance sample compilation 2014-11-12 18:07:20 +03:00
Yan Wang
a8b4c99ed6 Improve the performance of fast_nlmeans_denoising_opencl.
1. Remove unnecessary barriers.
2. Adjust CTA_SIZE based on the following cases for Intel platform:
   a) OCL_Photo_DenoisingGrayscale.DenoisingGrayscale
   b) OCL_Photo_DenoisingColored.DenoisingColored
2014-11-12 22:34:33 +08:00
Vadim Pisarevsky
4763d8033a Merge pull request #3406 from shiquanwang:Fix-bug-#4003_build-python-binding-under-python3 2014-11-12 11:26:19 +00:00
Maksim Shabunin
6aa7a86ae9 Doxygen documentation for core module 2014-11-12 14:21:58 +03:00
Vadim Pisarevsky
23a81c0fb8 Merge pull request #3407 from wangyan42164:canny_bug_fix 2014-11-12 11:09:55 +00:00
Yan Wang
184b6e314c Fix canny segment fault (Bug #3978)
Avoid stack overflow based on std::vector cause
std::vector::resize() segmentation fault.
2014-11-12 17:48:05 +08:00
Vadim Pisarevsky
77be6d64c1 Merge pull request #3410 from mgharbi:master 2014-11-12 08:49:50 +00:00
eltermann
b3a60b9c22 Documentation fix on py_tutorials/py_feature2d 2014-11-11 17:10:33 -02:00
Michae Gharbi
28103ad386 Fix Cuda -Wl linker options
This line causes the following error when building custom projects that use OpenCV beta 3:
ld: warning: directory not found for option '-L/<project_root>/-Wl,/usr/local/cuda'
2014-11-11 12:12:28 -05:00
Vadim Pisarevsky
bea86deea9 Merge pull request #3408 from ilya-lavrenov:doc_fix 2014-11-11 13:29:46 +00:00
Alexander Bohn / FI$H2k
8340e31f1f Fixed OS X compilation error in window_cocoa.mm
Un-commented `NSApplicationActivationPolicyRegular` argument (in leu of zero) and got rid of problematic dereference
2014-11-11 04:35:35 -08:00
Ilya Lavrenov
701d2386ce fixed doc 2014-11-10 16:19:27 +03:00
Shiquan Wang
7127634aa0 Mod: Open header files with io.open for Python 2/3 compatibility. 2014-11-10 21:09:43 +08:00
Alexander Alekhin
6550cb2a90 Merge tag '3.0.0-beta'
OpenCV 3.0.0 Beta
2014-11-10 14:42:47 +03:00
Vadim Pisarevsky
a181835549 Merge pull request #3405 from D-Alex:master 2014-11-10 08:19:29 +00:00
Vadim Pisarevsky
34f23b5917 Merge pull request #3404 from alalek:openni2_patch 2014-11-10 08:09:45 +00:00
Alexander Duda
60cacbfd66 solvePnPRansac: fix mask generation 2014-11-09 23:10:43 +01:00
Alexander Duda
ed55d13112 PnPRansacCallback::computeError: fix count in case of Nx3 matrices 2014-11-09 23:08:47 +01:00
Alexander Alekhin
2e05f1e3f8 openni_capture sample: enable OpenNI2 if available
Sample works with OpenNI2 with minimal code changes (CAP_OPENNI -> CAP_OPENNI2)
2014-11-08 02:22:29 +03:00
Alexander Alekhin
2981ee00d9 OpenNI2: prevent failure of setVideoMode() call with invalid parameters
Not all parameters are specified for openni::VideoMode, so
"selected" mode can be unsupported for device.
Replace default VideoMode constructor to result of getVideoMode() call.
2014-11-08 02:21:59 +03:00
Alexander Alekhin
ae4cb571ab Set status to beta 2014-11-07 19:22:46 +03:00
Vadim Pisarevsky
4f2aeeffaa Merge pull request #3403 from vpisarev:moved_partition 2014-11-07 16:04:56 +00:00
Vadim Pisarevsky
d58cadc1ea moved cv::partition from private.hpp to operations.hpp, to expose the function to users 2014-11-07 18:14:39 +03:00
Vadim Pisarevsky
47838a4a22 Merge pull request #3402 from vpisarev:fixed_python_tests 2014-11-07 14:34:14 +00:00
Vadim Pisarevsky
80a985c894 fixed path to the checkerboard image 2014-11-07 15:57:42 +03:00
Vadim Pisarevsky
9b13b07639 Merge pull request #3400 from vpisarev:fixed_umat_test_crash 2014-11-07 12:50:26 +00:00
Alexander Alekhin
569a95e9e1 Merge pull request #3394 from akarsakov:ocl_canny 2014-11-07 12:42:24 +00:00
Vadim Pisarevsky
fe4e1913f0 Merge pull request #3357 from briansp2020:master 2014-11-07 12:02:53 +00:00
Vadim Pisarevsky
573be75f50 Merge pull request #3392 from wangyan42164:houghlines_bug_fix 2014-11-07 11:52:58 +00:00
Vadim Pisarevsky
1abc26905d Merge pull request #3397 from ElenaGvozdeva:ocl_WarpAffine_test 2014-11-07 11:52:35 +00:00
Vadim Pisarevsky
7c8789dc12 fixed my_umat(roi).clone() test by disabling poorly aligned ROI's. Real fix of the problem will require a separate branch in UMat::copyTo(). 2014-11-07 14:49:48 +03:00
Yan Wang
0692bf5f34 Fix HoughLines crashes (Bug #3959).
Avoid phi exceed PI/2 to get the negative value of cos(phi).
2014-11-07 17:52:16 +08:00
Alexander Karsakov
7c870014fb Correctly unrolled some cycles 2014-11-07 12:13:00 +03:00
Alexander Alekhin
f50f249f80 Merge pull request #3138 from alalek:icv_update 2014-11-06 15:58:14 +00:00
Alexander Alekhin
ff095bbbfc Merge pull request #3396 from akarsakov:ocl_pow_fix 2014-11-06 15:49:42 +00:00
ElenaGvozdeva
7dd059c084 fixed test for ocl WarpAffine 2014-11-06 17:19:45 +03:00
Alexander Karsakov
462c3c25a9 Removed incorrect using of rootn() and powr() in ocl_pow 2014-11-06 16:23:02 +03:00
Alexander Karsakov
0ec0aeb7d0 Minor optimization for ocl_canny 2014-11-06 13:07:33 +03:00
Vadim Pisarevsky
5044e0f590 Merge pull request #3372 from pokeefe:add-test-for-projection-decomposition 2014-11-06 08:40:36 +00:00
Vadim Pisarevsky
cf0cc00547 Merge pull request #3391 from alalek:ocl_failure_messages 2014-11-06 08:37:34 +00:00
Vadim Pisarevsky
1d804bc695 Merge pull request #3360 from mirab:threshold_triangle 2014-11-06 08:36:24 +00:00
Brian Park
e4fa217a62 remove the unnecessary header file 2014-11-05 20:12:18 -08:00
Alexander Alekhin
4eb16122c0 ocl: change processing of OpenCL failures
disable "unwanted" messages
2014-11-05 19:44:36 +03:00
Miroslav Benes
4046f0398a Make Otsu and Triangle algorithms mutually exclusive
Make Otsu and Triangle algorithms mutually exclusive in cv::threshold code.

Signed-off-by: Miroslav Benes <mbenes@suse.cz>
2014-11-05 16:04:26 +01:00
Vadim Pisarevsky
da6898f758 Merge pull request #3389 from blackibiza84:master 2014-11-05 14:58:27 +00:00