Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Roman Donchenko
84262acbf0
Merge pull request #1012 from apavlenko:fix_3077
2013-06-19 12:25:23 +04:00
Vladislav Vinogradov
4e29f0ee6d
updated documentation
2013-06-18 08:36:49 +04:00
Vladislav Vinogradov
24108f8110
updated documentation
2013-06-17 09:53:39 +04:00
Andrey Pavlenko
01e9733155
fix for #3077
...
removing "-fvisibility=hidden" gcc option due to lack of `__attribute__ ((visibility("default")))` in jni_md.h/JNIEXPORT
2013-06-14 20:25:23 +04:00
Vladislav Vinogradov
a380c473b9
switched to Input/Output Array in reprojectImageTo3D & drawColorDisp
2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
3a02e599e0
refactored DisparityBilateralFilter
2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
be9bb8f18b
refactored StereoConstantSpaceBP
2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
d0e89337da
refactored StereoBeliefPropagation
2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
dd6d58f873
refactored StereoBM
2013-06-14 18:17:30 +04:00
Vladislav Vinogradov
4317cd1ffa
refactored 1D Sum Filters
2013-06-14 17:25:57 +04:00
Vladislav Vinogradov
4bb297afc2
refactored Image Rank Filters
2013-06-14 17:25:57 +04:00
Vladislav Vinogradov
5720eaf354
refactored Morphology Filters
2013-06-14 17:25:57 +04:00
Vladislav Vinogradov
12ae11e2ff
refactored Separable Linear Filters
2013-06-14 17:25:56 +04:00
Vladislav Vinogradov
ee7eb1b807
refactored Laplacian filter
2013-06-14 17:25:56 +04:00
Vladislav Vinogradov
1eedc6c42a
refactored Linear Filter
2013-06-14 17:25:56 +04:00
Vladislav Vinogradov
fcfcd4cbce
refactored box filter
2013-06-14 17:25:56 +04:00
Roman Donchenko
71db862dc2
Merge pull request #977 from jet47:gpucodec-refactoring
2013-06-14 16:24:24 +04:00
Roman Donchenko
2fc49ac564
Merge pull request #978 from jet47:gpuarithm-refactoring
2013-06-14 16:24:03 +04:00
Roman Donchenko
843094a07f
Merge pull request #996 from jet47:gpu-nvcuvid-libraries
2013-06-14 16:23:02 +04:00
Roman Donchenko
7308a4a845
Merge pull request #995 from jet47:fix-bug-2985
2013-06-14 16:22:47 +04:00
Roman Donchenko
918f37542b
Merge pull request #999 from snosov1:unreliable-results-fix
2013-06-14 16:19:50 +04:00
Roman Donchenko
9cbeea03fa
Merge pull request #1005 from alekcac:doc_fix
2013-06-14 15:53:36 +04:00
Roman Donchenko
c4974a2511
Merge pull request #1004 from jet47:fix-bug-3068
2013-06-14 15:52:56 +04:00
Roman Donchenko
4bc4f4aa1f
Merge pull request #1003 from vhdirk:gstreamerfixes
2013-06-14 15:51:03 +04:00
Roman Donchenko
fbc6814023
Merge pull request #987 from jet47:bug-3085-fix
2013-06-14 15:49:33 +04:00
Roman Donchenko
d998e38a12
Merge pull request #983 from HapeMask:python3-compatibility
2013-06-14 15:48:37 +04:00
Roman Donchenko
47ea0614dc
Merge pull request #969 from pengx17:2.4_binary_cache
2013-06-14 15:47:23 +04:00
Roman Donchenko
0124902f42
Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows
2013-06-14 15:46:25 +04:00
Roman Donchenko
308c7f5f6e
Merge pull request #1000 from ivan-korolev:fix_sift_bug_2892
2013-06-14 13:50:01 +04:00
Roman Donchenko
aea96e98bb
Merge pull request #1001 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 #3068 (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
Roman Donchenko
130794d41c
Merge pull request #990 from asmorkalov:pthread_build_fix
2013-06-14 11:48:05 +04:00
Roman Donchenko
83fa4d38a4
Merge pull request #976 from PeterMinin:num_detections
2013-06-14 11:24:00 +04:00
Ivan Korolev
58fa401b4d
Fixed a bug #2405
2013-06-14 10:43:20 +04:00
Andrey Pavlenko
b84296c02e
Merge pull request #998 from asmorkalov:android_cmake_mips_fix
2013-06-14 10:17:23 +04:00
Ivan Korolev
fc82150edc
Fixed a bug #2892
2013-06-14 08:21:42 +04:00
Peter Minin
7d70399d72
Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods
2013-06-14 04:25:17 +04:00
Gabe Schwartz
bb209193c9
Updated usage of METH_X definitions for python 3.
...
Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS.
2013-06-13 20:10:01 -04:00
Gabe Schwartz
bce1b352e7
Updated cmake files to use print().
...
In these cases, just using print() is enough to ensure py2/3
compatibility.
2013-06-13 20:10:01 -04:00
Gabe Schwartz
fb9781b97b
Updated cv2.cpp to support Python 3 API.
...
Added a header with defines to enable the module to compile with either
python 2 or 3 without changes.
2013-06-13 20:10:01 -04:00
Gabe Schwartz
931ebab822
Updated generator and parser to support Python 3.
2013-06-13 18:39:47 -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 #993 from ivan-korolev:fix_videostab_bug_3023
2013-06-13 16:57:12 +04:00
Roman Donchenko
533d4fe051
Merge pull request #988 from snosov1:3071-fix
2013-06-13 16:56:41 +04:00
Roman Donchenko
b725cbf73f
Merge pull request #986 from pengx17:2.4_initiated_context
2013-06-13 16:55:56 +04:00
Roman Donchenko
5bb6d36684
Merge pull request #982 from pengx17:2.4_fix_two_bugs
2013-06-13 16:55:12 +04:00
Roman Donchenko
462047d1e4
Merge pull request #981 from SeninAndrew:ximea_camera_support_fix
2013-06-13 16:54:45 +04:00
