7650 Commits

Author SHA1 Message Date
Roman Donchenko
25613fbfd7 Merge pull request from ivan-korolev:fix_sift_bug_2892 2013-06-18 18:32:03 +04:00
Roman Donchenko
748210e11b Merge pull request from asmorkalov:android_java_wrappers 2013-06-18 16:46:04 +04:00
Alexander Smorkalov
16c4aad36d Java/Python bindings for computeCorrespondEpilines added.
Simle Java test for computeCorrespondEpilines added.
2013-06-18 16:44:23 +04:00
Roman Donchenko
5b39c02c39 Merge pull request from alekcac:i_camera 2013-06-18 15:54:01 +04:00
Alexander Shishkov
24fd2cc326 updated licenses 2013-06-18 07:02:09 +04:00
Alexander Shishkov
5db08961ce fixed Kirill's comments 2013-06-18 06:59:52 +04:00
Ivan Korolev
fee8121040 Added regression tests for SURF/SIFT (related to ) 2013-06-14 17:08:01 +04:00
Roman Donchenko
843094a07f Merge pull request from jet47:gpu-nvcuvid-libraries 2013-06-14 16:23:02 +04:00
Roman Donchenko
7308a4a845 Merge pull request from jet47:fix-bug-2985 2013-06-14 16:22:47 +04:00
Roman Donchenko
918f37542b Merge pull request from snosov1:unreliable-results-fix 2013-06-14 16:19:50 +04:00
Roman Donchenko
9cbeea03fa Merge pull request from alekcac:doc_fix 2013-06-14 15:53:36 +04:00
Roman Donchenko
c4974a2511 Merge pull request from jet47:fix-bug-3068 2013-06-14 15:52:56 +04:00
Roman Donchenko
fbc6814023 Merge pull request from jet47:bug-3085-fix 2013-06-14 15:49:33 +04:00
Roman Donchenko
47ea0614dc Merge pull request from pengx17:2.4_binary_cache 2013-06-14 15:47:23 +04:00
Roman Donchenko
0124902f42 Merge pull request from dominikrose:mingw-libdc1394-2-windows 2013-06-14 15:46:25 +04:00
Alexander Shishkov
0cee15eb7f Updated iOS camera. Added rotation flag. Added functions to lock/unlock focus, white balance and exposure. 2013-06-14 15:10:25 +04:00
Roman Donchenko
308c7f5f6e Merge pull request from ivan-korolev:fix_sift_bug_2892 2013-06-14 13:50:01 +04:00
Roman Donchenko
aea96e98bb Merge pull request from ivan-korolev:fix_stitching_bug_2405 2013-06-14 13:47:33 +04:00
Alexander Shishkov
93200922fd Fix bug with indices 2013-06-14 13:12:35 +04:00
Vladislav Vinogradov
a4750f49c6 fix for bug (PCA::computeVar for double input):
The matrix g  can have CV_32F or CV_64F type,  but g.at uses only float template.
This fix adds specialization for double type.
2013-06-14 12:53:44 +04:00
peng xiao
e6b18fc492 Fix a bug caused by NDEBUG macro; it is now removed.
Revise some descriptions of the enums.
2013-06-14 16:37:00 +08:00
Ivan Korolev
58fa401b4d Fixed a bug 2013-06-14 10:43:20 +04:00
Andrey Pavlenko
b84296c02e Merge pull request from asmorkalov:android_cmake_mips_fix 2013-06-14 10:17:23 +04:00
Ivan Korolev
fc82150edc Fixed a bug 2013-06-14 08:21:42 +04:00
Sergei Nosov
c90abb6a03 add multiruns to fix "unreliable results" error 2013-06-13 21:14:42 +04:00
Roman Donchenko
8fa1e756e2 Merge pull request from ivan-korolev:fix_videostab_bug_3023 2013-06-13 16:57:12 +04:00
Roman Donchenko
533d4fe051 Merge pull request from snosov1:3071-fix 2013-06-13 16:56:41 +04:00
Roman Donchenko
b725cbf73f Merge pull request from pengx17:2.4_initiated_context 2013-06-13 16:55:56 +04:00
Roman Donchenko
5bb6d36684 Merge pull request from pengx17:2.4_fix_two_bugs 2013-06-13 16:55:12 +04:00
Roman Donchenko
462047d1e4 Merge pull request from SeninAndrew:ximea_camera_support_fix 2013-06-13 16:54:45 +04:00
Alexander Smorkalov
80f6ede233 Fix build problems on MIPS and Linaro NDK.
Merged android.toolchain.cmake from project
https://github.com/taka-no-me/android-cmake
commit: fd1f7055f8b7338644d58d9a2015a784dfa3a5ca
2013-06-13 16:51:45 +04:00
Vladislav Vinogradov
0367a7f992 link with nvcuvenc and ffmpeg libraries only if WITH_NVCUVID is enabled 2013-06-13 16:46:34 +04:00
Roman Donchenko
7aac543570 Merge pull request from asmorkalov:android_javadoc_fix 2013-06-13 16:30:14 +04:00
Vladislav Vinogradov
055137582c fix for bug :
OPENCLAMDBLAS and OPENCLAMDFFT never detected under linux.
lib64/import and lib32/import is the path on Windows but not Linux.
for CLAMDBLAS library we should use CLAMDBLAS_PATH (not CLAMDFFT_PATH)
2013-06-13 16:13:46 +04:00
Ivan Korolev
de4c3f0178 Fixed a bug related to video stabilization crashes with a blank video (Bug ) 2013-06-13 13:41:43 +04:00
Alexander Smorkalov
83e9b0a87a Javadoc waring fix. 2013-06-13 12:40:14 +04:00
Sergei Nosov
982ef83f80 Fixes bug .
If we have perfect matches (min_dist == 0.0), then strict comparison
fails. Making it non-strict results in treating perfect matches as
good.
2013-06-13 11:51:45 +04:00
Vladislav Vinogradov
e433145b7e fix for Bug :
weights array is only allocated for (l_count+1) elements,
but then weights[l_count+1] element is accessed.
2013-06-13 10:22:56 +04:00
peng xiao
5fd724b54a Add a function to query if global OpenCL context is initialized. 2013-06-13 10:46:12 +08:00
Peng Xiao
d9ab22e4ed Fix two bugs related to opencl context.
1. As getDevice will implicitly call setDevice, in getContext we should not need to call it again.
2. Fix an incorrect type casting.
2013-06-12 13:55:20 +08:00
Andrew Senin
8eb6decb25 Fixed Ximea cameras support 2013-06-11 21:17:31 +04:00
Roman Donchenko
98f6a4a615 Merge pull request from jet47:mog2-params-bug-2168 2013-06-11 18:21:52 +04:00
Roman Donchenko
a4ecd32176 Merge pull request from SpecLad:include-config 2013-06-11 18:18:14 +04:00
Roman Donchenko
572cfc99a8 Merge pull request from pengx17:2.4_oclclahe 2013-06-11 18:17:57 +04:00
Roman Donchenko
3af21cad4c Merge pull request from aks2:2.4 2013-06-11 17:35:39 +04:00
Peng Xiao
c8398c9fdc Use anonymous enumerations instead of constants 2013-06-11 20:32:55 +08:00
Roman Donchenko
a75fbb0031 Merge pull request from asmorkalov:android_na_cproj_fix 2013-06-11 11:59:32 +04:00
Roman Donchenko
d583a79869 Revert "Add a variant of detectMultiScale with an argument 'weights'"
It was merged by mistake.

This reverts commit ab6be9b7b7691967e42297aa6d3a67fb07597fd8.
2013-06-10 17:06:34 +04:00
Vadim Pisarevsky
52e9974431 Merge pull request from PeterMinin:detected_objects_weight 2013-06-10 15:22:46 +04:00
Roman Donchenko
1b689a7431 Merge pull request from SpecLad:matchers-ctor 2013-06-10 15:06:31 +04:00