Andrey Pavlenko
04c857a4e8
Merge pull request #2505 from alalek:umat_unmap_synchronization_test
11 years ago
Andrey Pavlenko
a2f8a93bf5
Merge pull request #2529 from ilya-lavrenov:tapi_filter2D
11 years ago
Andrey Pavlenko
6c12f20395
Merge pull request #2528 from mlyashko:back_proj_fix
11 years ago
Ilya Lavrenov
f7d6d3cff5
improved cv::filter2D
11 years ago
Roman Donchenko
491b84d463
Merge pull request #2478 from clemenscorny:master
11 years ago
Roman Donchenko
d67b450741
Merge pull request #2378 from ngryman:progressive_jpeg
11 years ago
Nicolas Gryman
b211e1d989
added jpeg progressive support.
11 years ago
mlyashko
70fdfa0bdb
changed type of sanity check
11 years ago
Andrey Pavlenko
d63a8ba018
Merge pull request #2523 from ilya-lavrenov:tapi_filters
11 years ago
Alexander Alekhin
6bd7a444bc
UMat map-unmap synchronization test
11 years ago
Clemens Korner
f1c8b4b965
FEATURES2D: add DenseFeatureDetector Python wrapper
11 years ago
mlyashko
953aafbd3d
Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix
11 years ago
mlyashko
f38fe76025
added perf test for CalcBackProj
11 years ago
Roman Donchenko
da7a605224
Merge pull request #2123 from white-pony:vkysenko/fix-mertens
11 years ago
Andrey Pavlenko
c6199fc3c1
Merge pull request #2526 from KonstantinMatskevich:ocl_morph_fix
11 years ago
Roman Donchenko
85cf2d9671
Merge pull request #2524 from SpecLad:merge-2.4
11 years ago
Konstantin Matskevich
67926fa028
ocl morphology fix
11 years ago
Andrey Pavlenko
9e1124d24a
Merge pull request #2525 from ilya-lavrenov:tapi_sep
11 years ago
Andrey Pavlenko
ba2eee9cbd
Merge pull request #2522 from ilya-lavrenov:tapi_canny
11 years ago
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
Andrey Pavlenko
9c5745383f
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
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
Ilya Lavrenov
6ba60a1e22
added 3-channels support to cv::Canny
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
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
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
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