Roman Donchenko
85cf2d9671
Merge pull request #2524 from SpecLad:merge-2.4
2014-03-25 12:13:04 +04:00
Andrey Pavlenko
9e1124d24a
Merge pull request #2525 from ilya-lavrenov:tapi_sep
2014-03-24 22:43:34 +04:00
Andrey Pavlenko
ba2eee9cbd
Merge pull request #2522 from ilya-lavrenov:tapi_canny
2014-03-24 19:31:26 +04:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Andrey Pavlenko
9c5745383f
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
2014-03-24 18:46:01 +04:00
Ilya Lavrenov
061a25447e
eliminated restriction delta == 0 from cv::sepFilter2D
2014-03-24 17:39:07 +04:00
Konstantin Matskevich
c2355d3a12
case-insensitivity
2014-03-24 15:20:00 +04:00
Ilya Lavrenov
6ba60a1e22
added 3-channels support to cv::Canny
2014-03-24 13:02:54 +04:00
Roman Donchenko
bcb0ee3e4b
Merge pull request #2514 from asmorkalov:android_two_libs_cuda
2014-03-24 12:26:57 +04:00
Roman Donchenko
9aa6528fd7
Merge pull request #2504 from asmorkalov:android_camera_locks_24
2014-03-24 12:06:51 +04:00
Roman Donchenko
7efb09fb8f
Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert
2014-03-24 12:03:27 +04:00
Roman Donchenko
623b1db8d1
Merge pull request #2515 from apavlenko:perf_default_strategy
2014-03-24 12:02:30 +04:00
Andrey Pavlenko
d8c018289a
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
2014-03-24 10:37:15 +04:00
Andrey Pavlenko
157f35ef29
Merge pull request #2503 from mlyashko:optflow_dualtvl1
2014-03-24 10:35:51 +04:00
Andrey Pavlenko
ae89787984
Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree
2014-03-24 10:25:47 +04:00
Andrey Pavlenko
cf3a2e30cd
Merge pull request #2517 from ilya-lavrenov:fix
2014-03-24 10:25:04 +04:00
Ilya Lavrenov
20b6191842
doc fix
2014-03-23 16:20:00 +04:00
Alexander Smorkalov
64d679ecb4
Added guard to prevent from gpu module redefinition in OpenCV.mk
2014-03-22 05:41:29 +04:00
Andrey Pavlenko
244f126ff6
Merge pull request #2454 from apavlenko:2.4_haar_extend
2014-03-21 18:45:58 +04:00
Andrey Pavlenko
f368b27f0a
Merge pull request #2489 from vbystricky:iocl_pyrlk
2014-03-21 18:33:32 +04:00
Andrey Pavlenko
a3668f1369
changing default perf strategy from BASIC (old) to SIMPLE (new, faster)
2014-03-21 18:29:06 +04:00
Andrey Pavlenko
8ac93f9b6b
Merge pull request #2508 from akarsakov:fix_erode_intel
2014-03-21 18:25:12 +04:00
Andrey Pavlenko
ef9669ba1a
Merge pull request #2506 from apavlenko:lbp_ocl_use_any_device
2014-03-21 18:24:36 +04:00
Alexander Smorkalov
3b65b710b6
Implicit linkage with CUDA runtime reverted.
2014-03-21 17:58:59 +04:00
Alexander Smorkalov
0dba5bdc4a
Multiple fixes in camera.
...
Fixed constant value for focus mode FOCUS_MODE_CONTINUES_PHOTO;
Add setters and getters for exposure lock and white balance lock flags;
Excluded camera restart for all setters except frame size.
2014-03-21 17:26:05 +04:00
Konstantin Matskevich
79fc3a6203
added gpu type selection in OPENCV_OPENCL_DEVICE parser
2014-03-21 17:01:37 +04:00
Roman Donchenko
46d39aff68
Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm
2014-03-21 16:28:48 +04:00
Andrey Pavlenko
7193762d2d
Merge pull request #2495 from ilya-lavrenov:tapi_flip
2014-03-21 16:08:46 +04:00
Andrey Pavlenko
d18ebfa8e8
Merge pull request #2500 from akarsakov:hog_intel_fix
2014-03-21 16:02:49 +04:00
Ilya Lavrenov
2875ce60ea
added 3-channels support to optimized version
2014-03-21 16:02:47 +04:00
Roman Donchenko
6bf4a7ce01
Merge pull request #2510 from asmorkalov:android_cuda_filter_fix
2014-03-21 16:00:29 +04:00
Andrey Pavlenko
fe5eaae102
adding missing include (fixing 'no ocl implementation' error)
2014-03-21 14:30:49 +04:00
Alexander Smorkalov
846266fde4
Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
2014-03-21 14:16:03 +04:00
Roman Donchenko
3572ee278e
Merge pull request #2396 from m3d:patch-1
2014-03-21 14:00:12 +04:00
Roman Donchenko
49efc250d3
Merge pull request #2400 from RJ2:Bugfix_2
2014-03-21 13:58:06 +04:00
Roman Donchenko
722c0fea41
Merge pull request #2414 from yashdv:meanshift_tutorial_error
2014-03-21 13:55:35 +04:00
Roman Donchenko
a66018d14d
Merge pull request #2423 from RJ2:bugfix_5
2014-03-21 13:54:52 +04:00
Alexander Smorkalov
b0ad84cfa2
Libraries filter update after abs path cut.
2014-03-21 12:48:38 +04:00
Andrey Pavlenko
4e851f5050
Merge pull request #2507 from apavlenko:haar_perf_test_cleanup
2014-03-21 12:20:32 +04:00
Alexander Karsakov
0bd4fd3a87
Workaround for Intel platform: replace min() with ternary operator
2014-03-21 09:33:00 +04:00
Andrey Pavlenko
b7198ccf1c
dropping legacy modes testing
2014-03-20 22:30:16 +04:00
Andrey Pavlenko
640e180efe
switching to CV_HAAR_SCALE_IMAGE mode, enabling test
2014-03-20 22:22:55 +04:00
Andrey Pavlenko
d060d30fa0
enabling OCL LBP branch for all devices
2014-03-20 21:57:34 +04:00
Andrey Pavlenko
bdfd29a0b8
Merge pull request #2496 from ilya-lavrenov:tapi_imgproc
2014-03-20 19:20:15 +04:00
Roman Donchenko
034ef02409
Merge pull request #2449 from asmorkalov:cuda_abs_path_fix
2014-03-20 17:49:41 +04:00
mlyashko
80a40ae3d7
changed epsilon for test pass on Win32
2014-03-20 16:15:43 +04:00
Andrey Pavlenko
9c7ba6db90
Merge pull request #2490 from ilya-lavrenov:ocl_sep_filters
2014-03-20 13:54:27 +04:00
Andrey Pavlenko
2299e2ed1b
Merge pull request #2494 from ilya-lavrenov:tapi_merge
2014-03-20 13:39:39 +04:00
Andrey Pavlenko
87ae0f9990
Merge pull request #2492 from KonstantinMatskevich:ocl_fix_wrongdevice
2014-03-20 13:39:17 +04:00
Ilya Lavrenov
63d8a61b9b
enabled 3-channels support for cv::createSuperResolution_BTVL1
2014-03-20 13:31:20 +04:00
