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
11 years ago
Roman Donchenko
8af175b81b
Merge pull request #2521 from atrebbi:#3620
11 years ago
Roman Donchenko
4d3f9228aa
Merge pull request #2516 from Daniil-Osokin:fix_docs
11 years ago
Andrey Pavlenko
9c5745383f
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
11 years ago
Daniil Osokin
ac19420907
Removed obsolete list from docs
11 years ago
Ilya Lavrenov
061a25447e
eliminated restriction delta == 0 from cv::sepFilter2D
11 years ago
Konstantin Matskevich
c2355d3a12
case-insensitivity
11 years ago
Ilya Lavrenov
e2c6ab0166
refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0
11 years ago
Ilya Lavrenov
b6833fdde7
added 3-channels support to cv::medianBlur
11 years ago
Ilya Lavrenov
a51ab99a79
added 3-channels support to cv::filter2D, cv::Laplacian
11 years ago
Ilya Lavrenov
e19c42dded
added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter
11 years ago
Ilya Lavrenov
8f5fd44fb2
added 3 channels support to cv::bilateralFilter
...
Conflicts:
modules/imgproc/test/ocl/test_filters.cpp
11 years ago
Roman Donchenko
f8a100f3e0
Merge pull request #2520 from vlkolesnikov:misprint_fix
11 years ago
Ilya Lavrenov
6ba60a1e22
added 3-channels support to cv::Canny
11 years ago
Daniil Osokin
04b1822cff
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
11 years ago
Roman Donchenko
bcb0ee3e4b
Merge pull request #2514 from asmorkalov:android_two_libs_cuda
11 years ago
Roman Donchenko
9aa6528fd7
Merge pull request #2504 from asmorkalov:android_camera_locks_24
11 years ago
Roman Donchenko
7efb09fb8f
Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert
11 years ago
Roman Donchenko
623b1db8d1
Merge pull request #2515 from apavlenko:perf_default_strategy
11 years ago
Vladimir Kolesnikov
60803afe8f
Misprint fixed in table formatter
11 years ago
Andrey Pavlenko
d8c018289a
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
11 years ago
Andrey Pavlenko
157f35ef29
Merge pull request #2503 from mlyashko:optflow_dualtvl1
11 years ago
Andrey Pavlenko
ae89787984
Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree
11 years ago
Andrey Pavlenko
cf3a2e30cd
Merge pull request #2517 from ilya-lavrenov:fix
11 years ago
Andrey Pavlenko
259b9e093c
disabling failing tests
11 years ago
Andrey Pavlenko
5421d741bc
making OCL tests conform to the comon style
11 years ago
Alessandro Trebbi
c4a63f6a86
-
11 years ago
Ilya Lavrenov
20b6191842
doc fix
11 years ago
Alexander Smorkalov
64d679ecb4
Added guard to prevent from gpu module redefinition in OpenCV.mk
11 years ago
Kang Liu
9dc51a1aa4
Keep definitions of link aliases consistent
11 years ago
Daniil Osokin
2d3aa3861c
Fixed Load, Modify, and Save an Image tutorial
11 years ago
Koji Miyazato
0a5d6e10b9
Added test code for I/O of user-defined types.
11 years ago
Andrey Pavlenko
244f126ff6
Merge pull request #2454 from apavlenko:2.4_haar_extend
11 years ago
Andrey Pavlenko
f368b27f0a
Merge pull request #2489 from vbystricky:iocl_pyrlk
11 years ago
Andrey Pavlenko
a3668f1369
changing default perf strategy from BASIC (old) to SIMPLE (new, faster)
11 years ago
Andrey Pavlenko
8ac93f9b6b
Merge pull request #2508 from akarsakov:fix_erode_intel
11 years ago
Andrey Pavlenko
ef9669ba1a
Merge pull request #2506 from apavlenko:lbp_ocl_use_any_device
11 years ago
Alexander Smorkalov
3b65b710b6
Implicit linkage with CUDA runtime reverted.
11 years ago
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.
11 years ago
Konstantin Matskevich
79fc3a6203
added gpu type selection in OPENCV_OPENCL_DEVICE parser
11 years ago
Roman Donchenko
46d39aff68
Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm
11 years ago
Andrey Pavlenko
7193762d2d
Merge pull request #2495 from ilya-lavrenov:tapi_flip
11 years ago
Andrey Pavlenko
d18ebfa8e8
Merge pull request #2500 from akarsakov:hog_intel_fix
11 years ago
Ilya Lavrenov
2875ce60ea
added 3-channels support to optimized version
11 years ago
Roman Donchenko
6bf4a7ce01
Merge pull request #2510 from asmorkalov:android_cuda_filter_fix
11 years ago
Kang Liu
dc21e2cc0e
remove highlighting in some function links
...
1. Remove whole-document highlighting in some function links
2. fix the function alias `readwriteimagevideo`
11 years ago
Andrey Pavlenko
fe5eaae102
adding missing include (fixing 'no ocl implementation' error)
11 years ago
Alexander Smorkalov
846266fde4
Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
11 years ago
Roman Donchenko
3572ee278e
Merge pull request #2396 from m3d:patch-1
11 years ago
Roman Donchenko
49efc250d3
Merge pull request #2400 from RJ2:Bugfix_2
11 years ago