Andrey Pavlenko [Tue, 25 Mar 2014 12:23:01 +0000 (16:23 +0400)]
Merge pull request #2523 from ilya-lavrenov:tapi_filters
Roman Donchenko [Tue, 25 Mar 2014 10:37:55 +0000 (14:37 +0400)]
Merge pull request #2123 from white-pony:vkysenko/fix-mertens
Andrey Pavlenko [Tue, 25 Mar 2014 08:59:10 +0000 (12:59 +0400)]
Merge pull request #2526 from KonstantinMatskevich:ocl_morph_fix
Roman Donchenko [Tue, 25 Mar 2014 08:13:03 +0000 (12:13 +0400)]
Merge pull request #2524 from SpecLad:merge-2.4
Konstantin Matskevich [Tue, 25 Mar 2014 06:39:50 +0000 (10:39 +0400)]
ocl morphology fix
Andrey Pavlenko [Mon, 24 Mar 2014 18:43:34 +0000 (22:43 +0400)]
Merge pull request #2525 from ilya-lavrenov:tapi_sep
Andrey Pavlenko [Mon, 24 Mar 2014 15:31:25 +0000 (19:31 +0400)]
Merge pull request #2522 from ilya-lavrenov:tapi_canny
Roman Donchenko [Mon, 24 Mar 2014 11:47:56 +0000 (15:47 +0400)]
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
Andrey Pavlenko [Mon, 24 Mar 2014 14:46:00 +0000 (18:46 +0400)]
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
Ilya Lavrenov [Mon, 24 Mar 2014 13:38:34 +0000 (17:38 +0400)]
eliminated restriction delta == 0 from cv::sepFilter2D
Konstantin Matskevich [Mon, 24 Mar 2014 11:20:00 +0000 (15:20 +0400)]
case-insensitivity
Ilya Lavrenov [Fri, 21 Mar 2014 11:59:54 +0000 (15:59 +0400)]
refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0
Ilya Lavrenov [Tue, 18 Mar 2014 21:26:38 +0000 (01:26 +0400)]
added 3-channels support to cv::medianBlur
Ilya Lavrenov [Tue, 18 Mar 2014 21:02:46 +0000 (01:02 +0400)]
added 3-channels support to cv::filter2D, cv::Laplacian
Ilya Lavrenov [Tue, 18 Mar 2014 20:33:01 +0000 (00:33 +0400)]
added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter
Ilya Lavrenov [Tue, 18 Mar 2014 19:56:06 +0000 (23:56 +0400)]
added 3 channels support to cv::bilateralFilter
Conflicts:
modules/imgproc/test/ocl/test_filters.cpp
Ilya Lavrenov [Wed, 19 Mar 2014 15:56:40 +0000 (19:56 +0400)]
added 3-channels support to cv::Canny
Roman Donchenko [Mon, 24 Mar 2014 08:26:57 +0000 (12:26 +0400)]
Merge pull request #2514 from asmorkalov:android_two_libs_cuda
Roman Donchenko [Mon, 24 Mar 2014 08:06:50 +0000 (12:06 +0400)]
Merge pull request #2504 from asmorkalov:android_camera_locks_24
Roman Donchenko [Mon, 24 Mar 2014 08:03:26 +0000 (12:03 +0400)]
Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert
Roman Donchenko [Mon, 24 Mar 2014 08:02:30 +0000 (12:02 +0400)]
Merge pull request #2515 from apavlenko:perf_default_strategy
Andrey Pavlenko [Mon, 24 Mar 2014 06:37:14 +0000 (10:37 +0400)]
Merge pull request #2491 from ilya-lavrenov:tapi_sep_filter
Andrey Pavlenko [Mon, 24 Mar 2014 06:35:50 +0000 (10:35 +0400)]
Merge pull request #2503 from mlyashko:optflow_dualtvl1
Andrey Pavlenko [Mon, 24 Mar 2014 06:25:47 +0000 (10:25 +0400)]
Merge pull request #2511 from apavlenko:2.4_fix_perf_nonfree
Andrey Pavlenko [Mon, 24 Mar 2014 06:25:03 +0000 (10:25 +0400)]
Merge pull request #2517 from ilya-lavrenov:fix
Ilya Lavrenov [Sun, 23 Mar 2014 12:20:00 +0000 (16:20 +0400)]
doc fix
Alexander Smorkalov [Fri, 21 Mar 2014 14:20:57 +0000 (18:20 +0400)]
Added guard to prevent from gpu module redefinition in OpenCV.mk
Andrey Pavlenko [Fri, 21 Mar 2014 14:45:58 +0000 (18:45 +0400)]
Merge pull request #2454 from apavlenko:2.4_haar_extend
Andrey Pavlenko [Fri, 21 Mar 2014 14:33:32 +0000 (18:33 +0400)]
Merge pull request #2489 from vbystricky:iocl_pyrlk
Andrey Pavlenko [Fri, 21 Mar 2014 14:29:06 +0000 (18:29 +0400)]
changing default perf strategy from BASIC (old) to SIMPLE (new, faster)
Andrey Pavlenko [Fri, 21 Mar 2014 14:25:11 +0000 (18:25 +0400)]
Merge pull request #2508 from akarsakov:fix_erode_intel
Andrey Pavlenko [Fri, 21 Mar 2014 14:24:36 +0000 (18:24 +0400)]
Merge pull request #2506 from apavlenko:lbp_ocl_use_any_device
Alexander Smorkalov [Fri, 21 Mar 2014 13:58:59 +0000 (17:58 +0400)]
Implicit linkage with CUDA runtime reverted.
Alexander Smorkalov [Wed, 19 Feb 2014 12:20:40 +0000 (16:20 +0400)]
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.
Konstantin Matskevich [Fri, 21 Mar 2014 12:56:12 +0000 (16:56 +0400)]
added gpu type selection in OPENCV_OPENCL_DEVICE parser
Roman Donchenko [Fri, 21 Mar 2014 12:28:47 +0000 (16:28 +0400)]
Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm
Andrey Pavlenko [Fri, 21 Mar 2014 12:08:45 +0000 (16:08 +0400)]
Merge pull request #2495 from ilya-lavrenov:tapi_flip
Andrey Pavlenko [Fri, 21 Mar 2014 12:02:48 +0000 (16:02 +0400)]
Merge pull request #2500 from akarsakov:hog_intel_fix
Ilya Lavrenov [Thu, 20 Mar 2014 14:38:31 +0000 (18:38 +0400)]
added 3-channels support to optimized version
Roman Donchenko [Fri, 21 Mar 2014 12:00:29 +0000 (16:00 +0400)]
Merge pull request #2510 from asmorkalov:android_cuda_filter_fix
Andrey Pavlenko [Fri, 21 Mar 2014 10:30:49 +0000 (14:30 +0400)]
adding missing include (fixing 'no ocl implementation' error)
Alexander Smorkalov [Wed, 19 Feb 2014 12:20:40 +0000 (16:20 +0400)]
Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
Roman Donchenko [Fri, 21 Mar 2014 10:00:12 +0000 (14:00 +0400)]
Merge pull request #2396 from m3d:patch-1
Roman Donchenko [Fri, 21 Mar 2014 09:58:05 +0000 (13:58 +0400)]
Merge pull request #2400 from RJ2:Bugfix_2
Roman Donchenko [Fri, 21 Mar 2014 09:55:34 +0000 (13:55 +0400)]
Merge pull request #2414 from yashdv:meanshift_tutorial_error
Roman Donchenko [Fri, 21 Mar 2014 09:54:51 +0000 (13:54 +0400)]
Merge pull request #2423 from RJ2:bugfix_5
Alexander Smorkalov [Fri, 21 Mar 2014 08:48:38 +0000 (12:48 +0400)]
Libraries filter update after abs path cut.
Andrey Pavlenko [Fri, 21 Mar 2014 08:20:32 +0000 (12:20 +0400)]
Merge pull request #2507 from apavlenko:haar_perf_test_cleanup
Alexander Karsakov [Mon, 17 Mar 2014 08:18:55 +0000 (12:18 +0400)]
Workaround for Intel platform: replace min() with ternary operator
Andrey Pavlenko [Thu, 20 Mar 2014 18:30:16 +0000 (22:30 +0400)]
dropping legacy modes testing
Andrey Pavlenko [Thu, 20 Mar 2014 18:22:55 +0000 (22:22 +0400)]
switching to CV_HAAR_SCALE_IMAGE mode, enabling test
Andrey Pavlenko [Thu, 20 Mar 2014 17:57:34 +0000 (21:57 +0400)]
enabling OCL LBP branch for all devices
Andrey Pavlenko [Thu, 20 Mar 2014 15:20:14 +0000 (19:20 +0400)]
Merge pull request #2496 from ilya-lavrenov:tapi_imgproc
Roman Donchenko [Thu, 20 Mar 2014 13:49:41 +0000 (17:49 +0400)]
Merge pull request #2449 from asmorkalov:cuda_abs_path_fix
mlyashko [Thu, 20 Mar 2014 12:15:43 +0000 (16:15 +0400)]
changed epsilon for test pass on Win32
Andrey Pavlenko [Thu, 20 Mar 2014 09:54:26 +0000 (13:54 +0400)]
Merge pull request #2490 from ilya-lavrenov:ocl_sep_filters
Andrey Pavlenko [Thu, 20 Mar 2014 09:39:39 +0000 (13:39 +0400)]
Merge pull request #2494 from ilya-lavrenov:tapi_merge
Andrey Pavlenko [Thu, 20 Mar 2014 09:39:16 +0000 (13:39 +0400)]
Merge pull request #2492 from KonstantinMatskevich:ocl_fix_wrongdevice
Ilya Lavrenov [Wed, 19 Mar 2014 15:12:37 +0000 (19:12 +0400)]
enabled 3-channels support for cv::createSuperResolution_BTVL1
Alexander Karsakov [Wed, 19 Mar 2014 13:33:13 +0000 (17:33 +0400)]
Fixed incorrect thread synchronizations
Roman Donchenko [Thu, 20 Mar 2014 08:40:23 +0000 (12:40 +0400)]
Merge pull request #2473 from euphrat:mog2_weight_bugfix
Ilya Lavrenov [Wed, 19 Mar 2014 20:28:21 +0000 (00:28 +0400)]
fixed bug in cv::ocl::predictOptimalVectorWidth
Ilya Lavrenov [Wed, 19 Mar 2014 14:49:33 +0000 (18:49 +0400)]
generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support
Alexander Smorkalov [Fri, 28 Feb 2014 14:18:20 +0000 (18:18 +0400)]
Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path.
Alexander Karsakov [Wed, 19 Mar 2014 13:30:13 +0000 (17:30 +0400)]
Enabled Intel-specific optimizations for HOG detector.
Ilya Lavrenov [Wed, 19 Mar 2014 11:59:00 +0000 (15:59 +0400)]
simplified cv::sepFilter2D OpenCL part
Roman Donchenko [Wed, 19 Mar 2014 10:49:21 +0000 (14:49 +0400)]
Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control
Ilya Lavrenov [Tue, 18 Mar 2014 12:02:25 +0000 (16:02 +0400)]
eliminated restriction src[i].channels() == 1 in cv::merge
Andrey Pavlenko [Wed, 19 Mar 2014 08:56:11 +0000 (12:56 +0400)]
Merge pull request #2493 from ilya-lavrenov:tapi_fnlm
Konstantin Matskevich [Wed, 19 Mar 2014 08:14:48 +0000 (12:14 +0400)]
update error message
Ilya Lavrenov [Tue, 18 Mar 2014 15:42:04 +0000 (19:42 +0400)]
added 3-channels support to cv::setIdentity
Ilya Lavrenov [Tue, 18 Mar 2014 16:02:04 +0000 (20:02 +0400)]
added 3-channels support to morphology operations
Ilya Lavrenov [Tue, 18 Mar 2014 15:31:37 +0000 (19:31 +0400)]
added 3-channels support to cv::flip
Firat Kalaycilar [Tue, 18 Mar 2014 15:26:24 +0000 (17:26 +0200)]
Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in the CUDA and OCL versions of BackgroundSubtractorMOG2
Alexander Smorkalov [Wed, 5 Mar 2014 08:31:04 +0000 (12:31 +0400)]
Superres module enabled for Android. GPU samples build fixed for Android.
Roman Donchenko [Tue, 18 Mar 2014 12:18:32 +0000 (16:18 +0400)]
Merge pull request #1986 from GregoryMorse:patch-3
Firat Kalaycilar [Tue, 18 Mar 2014 12:00:30 +0000 (14:00 +0200)]
Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_weight_bugfix
Andrey Pavlenko [Tue, 18 Mar 2014 11:53:09 +0000 (15:53 +0400)]
Merge pull request #2464 from KonstantinMatskevich:ocl_stereobm_experiment
Konstantin Matskevich [Tue, 18 Mar 2014 09:19:41 +0000 (13:19 +0400)]
fix for incorrect opencl device selection
Roman Donchenko [Tue, 18 Mar 2014 11:41:20 +0000 (15:41 +0400)]
Merge pull request #2488 from Nerei:minor_doc
Roman Donchenko [Tue, 18 Mar 2014 10:39:40 +0000 (14:39 +0400)]
Merge pull request #2456 from kurodash:pr_use_cvAlloc
Ilya Lavrenov [Tue, 18 Mar 2014 10:29:02 +0000 (14:29 +0400)]
added 4 channels support to fnlm
Roman Donchenko [Tue, 18 Mar 2014 09:55:56 +0000 (13:55 +0400)]
Merge pull request #2486 from SpecLad:merge-2.4
Roman Donchenko [Tue, 18 Mar 2014 09:40:43 +0000 (13:40 +0400)]
Merge pull request #2026 from pemmanuelviel:giveFurthestPoint
RJ2 [Tue, 18 Mar 2014 07:59:53 +0000 (08:59 +0100)]
I have changed one sentence in tutorial, making it more understandable
RJ2 [Tue, 18 Mar 2014 07:01:18 +0000 (08:01 +0100)]
It's will be better
yash [Tue, 18 Mar 2014 03:14:33 +0000 (08:44 +0530)]
edited sample code for mean/cam sihft and fixed an error
Ilya Lavrenov [Mon, 17 Mar 2014 15:59:35 +0000 (19:59 +0400)]
optimized sep filter
Ilya Lavrenov [Mon, 17 Mar 2014 14:52:28 +0000 (18:52 +0400)]
remove intel guard since the code is 2 times faster on AMD too
Anatoly Baksheev [Mon, 17 Mar 2014 13:02:49 +0000 (17:02 +0400)]
minor doc fix
vbystricky [Mon, 17 Mar 2014 12:03:15 +0000 (16:03 +0400)]
Fix problems on Intel HD graphics
Roman Donchenko [Mon, 17 Mar 2014 11:52:56 +0000 (15:52 +0400)]
Merge pull request #2460 from berak:b_3598_24
Roman Donchenko [Mon, 17 Mar 2014 10:43:15 +0000 (14:43 +0400)]
Merge pull request #2458 from asmorkalov:android_cmake_opencv_modules_suffix
Alexander Smorkalov [Wed, 5 Mar 2014 05:57:16 +0000 (09:57 +0400)]
OpenCV_MODULES_SUFFIX variable added to OpenCVConfig.cmake to enable custom module configurations.
Roman Donchenko [Mon, 17 Mar 2014 10:14:07 +0000 (14:14 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
Andrey Pavlenko [Mon, 17 Mar 2014 10:04:22 +0000 (14:04 +0400)]
Merge pull request #2479 from alalek:ocl_compare_scalar
berak [Thu, 13 Mar 2014 07:39:15 +0000 (08:39 +0100)]
fixed h / s ranges in histogram_calculation tutorial
literalinclude
literalinclude, dropped :lines:
Andrey Pavlenko [Mon, 17 Mar 2014 09:10:34 +0000 (13:10 +0400)]
Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels
Alexander Alekhin [Mon, 17 Mar 2014 08:29:49 +0000 (12:29 +0400)]
ocl: compare: remove useless perf tests
Roman Donchenko [Mon, 17 Mar 2014 07:59:14 +0000 (11:59 +0400)]
Merge pull request #2485 from Nerei:viz_correct_viewer_pose
projects / platform / upstream / opencv.git / log