Commit Graph

9567 Commits

Author SHA1 Message Date
Andrey Pavlenko
def4f5e2a3 Merge pull request #2499 from mlyashko:back_proj_fix1 2014-04-07 10:57:21 +04:00
Vladislav Vinogradov
d822d6f101 disable GeneralizedHough tests on gcc 4.7 2014-04-07 09:49:17 +04:00
akrynski
1dba47b77b Update crop_face.py
I propose some changes, to automate file cropping
2014-04-06 18:48:38 +02:00
Andrey Pavlenko
d1710a8547 Merge pull request #2562 from akarsakov:gftt_fix 2014-04-04 13:34:31 +04:00
krodyush
4ca695cab0 Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow
Conflicts:
	modules/video/src/opencl/pyrlk.cl
2014-04-04 11:26:08 +04:00
Vladislav Vinogradov
f8d922ad3e disable gpu::GeneralizedHough compilation on gcc 4.7 2014-04-04 10:31:33 +04:00
Andrey Pavlenko
5a3200d513 Merge pull request #2567 from apavlenko:fix_compare_scalar 2014-04-03 22:08:18 +04:00
Andrey Pavlenko
9a3895d842 Merge pull request #2556 from DeanF:master 2014-04-03 17:07:06 +04:00
Alexander Karsakov
c747426fc1 Enabled integer arithmetic for filterSepSinglePass 2014-04-03 16:53:57 +04:00
Andrey Pavlenko
271f60ba7a fixing OCL run condition (build program failure for comparison 64F Mat with Scalar) 2014-04-03 16:21:04 +04:00
Alexander Alekhin
bfc546d23c enable IPP ICV support 2014-04-03 15:05:38 +04:00
Elena Gvozdeva
037ac27ec8 Added SharedMatrix 2014-04-03 14:53:27 +04:00
Alexander Karsakov
fc10ffefb8 Enabled integer arithmetic for row_filter_C1_D0 2014-04-03 13:31:06 +04:00
Alexander Karsakov
2cf3a6e26c Fixed error in case corners not found 2014-04-03 10:30:55 +04:00
Alexander Karsakov
a3825acee4 Small refactoring 2014-04-02 16:38:32 +04:00
Andrey Pavlenko
2aab7b2926 Merge pull request #2557 from ilya-lavrenov:tapi_fnlm_fix 2014-04-02 13:01:08 +04:00
Roman Donchenko
c165f07319 Merge pull request #2550 from SpecLad:merge-2.4 2014-04-02 12:00:01 +04:00
Ilya Lavrenov
2cd51c04e4 fixed condition in cv::FNLM 2014-04-01 23:18:07 +04:00
DeanF
48df67a9c5 Fixed trailing whitespace 2014-04-01 22:04:58 +03:00
DeanF
bdc91c66c9 Fixed problem with compilation without HAVE_OPENCL
When compiling without OpenCL, some classes from its namespace are still used in code.
2014-04-01 21:20:13 +03:00
Elena Gvozdeva
fa2d79a15b Added IPP Async converters, doc and sample 2014-04-01 16:47:29 +04:00
Andrey Pavlenko
6ef94b52ad Merge pull request #2536 from ilya-lavrenov:tapi_resize_linear 2014-04-01 12:54:07 +04:00
Roman Donchenko
a8cb5c3983 Merge pull request #2554 from asmorkalov:ocv_249_version 2014-04-01 12:16:25 +04:00
Alexander Smorkalov
e23f7303a6 OpenCV version++. OpenCV Manager version++. 2014-03-31 15:00:25 -07:00
Andrey Pavlenko
0d5ffec521 Merge pull request #2553 from ilya-lavrenov:typo 2014-03-31 23:21:07 +04:00
Andrey Pavlenko
aa3c4ae5d2 Merge pull request #2552 from ilya-lavrenov:tapi_compare 2014-03-31 21:22:00 +04:00
Andrey Pavlenko
97eac3f394 Merge pull request #2551 from ilya-lavrenov:ocl_nonfree 2014-03-31 21:21:27 +04:00
Ilya Lavrenov
31f864a22b integer cv::resize (INTER_LINEAR && CV_8UC(cn)) 2014-03-31 20:25:53 +04:00
Andrey Pavlenko
bb3c0c066c Merge pull request #2548 from jet47:gpu_mog2_test 2014-03-31 20:19:21 +04:00
Ilya Lavrenov
9b9769169f doc typos 2014-03-31 19:57:05 +04:00
Andrey Pavlenko
d170faeb5c Merge pull request #2549 from ilya-lavrenov:tapi_laplacian 2014-03-31 19:36:44 +04:00
Andrey Pavlenko
6c2d77079f Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb 2014-03-31 18:17:50 +04:00
Ilya Lavrenov
322b15a459 compare with scalar (cn > 1) 2014-03-31 17:50:16 +04:00
Ilya Lavrenov
7df92bbb77 fixed C4505 2014-03-31 17:30:15 +04:00
Alexander Karsakov
10a52220f0 Added integer arithmetic to sepFilter2D 2014-03-31 16:45:15 +04:00
Andrey Pavlenko
1f4586f3dd Merge pull request #2541 from JinoBetti:2.4 2014-03-31 15:48:45 +04:00
Ilya Lavrenov
c53398a438 performance tests for FAST 2014-03-31 15:03:00 +04:00
mlyashko
5acd178790 copyright fix 2014-03-31 14:57:03 +04:00
Roman Donchenko
f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
Ilya Lavrenov
e1efed1914 added support of ksize >= 5 to cv::Laplacian 2014-03-31 13:17:58 +04:00
mlyashko
4c5de04efb bug fix 2014-03-31 10:58:15 +04:00
Vladislav Vinogradov
6d368dc1e7 increase epsilon for MOG2::getBackgroundImage test:
it uses float arithmetics
2014-03-30 18:02:03 -07:00
Andrey Pavlenko
51530d4d8e Merge pull request #2543 from apavlenko:24_haar_revert 2014-03-28 23:17:08 +04:00
Alexander Karsakov
d17142b83d Prototype OCL version of gaussian blur with integer arithmetic 2014-03-28 21:46:03 +04:00
unknown
75534a4828 Python typdef fixed. Reverted the example to MOG2. Not time to make the command line switch for now. 2014-03-28 14:23:10 +01:00
Andrey Pavlenko
3747d2643f Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels"
This reverts commit 3dcddad88a.

Conflicts:
	modules/ocl/src/opencl/haarobjectdetect.cl
2014-03-28 16:08:11 +04:00
Andrey Pavlenko
7d82171af4 - fix test 2014-03-28 16:06:39 +04:00
Andrey Pavlenko
e6e817e613 Revert "Merge pull request #1779 from perping:integral_2.4"
This reverts commit 54ea5bbac7, reversing
changes made to 28e0d3d771.
2014-03-28 16:05:04 +04:00
Roman Donchenko
0469c18726 Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix 2014-03-28 12:45:39 +04:00
Roman Donchenko
d6b54ff9d1 Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage 2014-03-28 12:17:16 +04:00
Roman Donchenko
e055b68ceb Merge pull request #2403 from hbristow:issue-3451 2014-03-28 12:13:14 +04:00
Roman Donchenko
0b4534d4c9 Merge pull request #2379 from ngryman:optimize_jpeg 2014-03-28 12:08:55 +04:00
Roman Donchenko
4382970739 Merge pull request #2540 from mjul:fixtypos_2.4 2014-03-28 11:58:11 +04:00
Koji Miyazato
1ab8060b62 corrected some style errors found by review. 2014-03-28 10:45:33 +09:00
Alexander Smorkalov
d17740ec87 Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed. 2014-03-28 04:56:31 +04:00
Nicolas Gryman
da34f1d58c added jpeg with optimized coding support. 2014-03-27 13:34:33 -04:00
JinoBetti
91511c1521 Update out.cpp
Fixed a bug with the cv::format(cv::Mat, ...) method for matrices with only one row

see http://answers.opencv.org/question/21201/cvformat-does-not-format-the-way-it-should/?answer=23945#post-id-23945 for details
2014-03-27 16:28:40 +01:00
Roman Donchenko
2e3e106676 Merge pull request #2537 from ilya-lavrenov:doc_fix 2014-03-27 17:43:02 +04:00
mlyashko
4b71921526 both tests by picture and rand mat 2014-03-27 17:08:05 +04:00
Martin Jul
a1798cb28e Fixed typo in BFMatcher in docs. 2014-03-27 13:52:49 +01:00
Ilya Lavrenov
80df44bd75 doc fix 2014-03-27 16:30:29 +04:00
Andrey Pavlenko
e34a7caabc Merge pull request #2535 from akarsakov:stereobm_fix 2014-03-27 15:22:45 +04:00
Alexander Karsakov
4ceaf44fa0 Fixed incorrect calculation of best_disp 2014-03-27 11:21:32 +04:00
Hilton Bristow
61c22d5899 removed experimental slots 2014-03-27 14:58:53 +10:00
Hilton Bristow
fc696a9ff3 Improved standalone importing behaviour and creation of nested directories 2014-03-27 14:52:23 +10:00
Hilton Bristow
6f190bb907 Generalized todict implementation 2014-03-27 14:51:17 +10:00
Hilton Bristow
068b1bc3d0 More generic todict 2014-03-27 11:34:20 +10:00
Alexander Alekhin
3488fdcb43 disable failed tests 2014-03-26 19:29:59 +04:00
Alexander Alekhin
569e1346f2 UMat: issue in OpenCLAllocator::unmap() 2014-03-26 19:29:41 +04:00
Andrey Pavlenko
04c857a4e8 Merge pull request #2505 from alalek:umat_unmap_synchronization_test 2014-03-26 19:08:15 +04:00
Andrey Pavlenko
a2f8a93bf5 Merge pull request #2529 from ilya-lavrenov:tapi_filter2D 2014-03-26 19:04:57 +04:00
Andrey Pavlenko
6c12f20395 Merge pull request #2528 from mlyashko:back_proj_fix 2014-03-26 19:04:39 +04:00
Andrey Pavlenko
a1d151924d Merge pull request #2527 from apavlenko:ocl_surf_24 2014-03-26 19:03:44 +04:00
Andrey Pavlenko
fa5705613d splitting plain and OCL tests for SURF. 2014-03-26 17:18:05 +04:00
Ilya Lavrenov
f7d6d3cff5 improved cv::filter2D 2014-03-26 14:19:59 +04:00
Roman Donchenko
491b84d463 Merge pull request #2478 from clemenscorny:master 2014-03-26 12:19:54 +04:00
Roman Donchenko
a7f9677378 Merge pull request #2404 from yashdv:old_basic_structures_doc_fix 2014-03-26 12:18:39 +04:00
Roman Donchenko
d67b450741 Merge pull request #2378 from ngryman:progressive_jpeg 2014-03-26 12:12:02 +04:00
Alexander Karsakov
8c39b4e8b6 Fixed stereoBM for Intel CPU. 2014-03-26 11:53:36 +04:00
Nicolas Gryman
b211e1d989 added jpeg progressive support. 2014-03-25 15:27:24 -04:00
mlyashko
70fdfa0bdb changed type of sanity check 2014-03-25 16:43:20 +04:00
Andrey Pavlenko
d63a8ba018 Merge pull request #2523 from ilya-lavrenov:tapi_filters 2014-03-25 16:23:02 +04:00
Alexander Alekhin
6bd7a444bc UMat map-unmap synchronization test 2014-03-25 16:19:52 +04:00
Clemens Korner
f1c8b4b965 FEATURES2D: add DenseFeatureDetector Python wrapper 2014-03-25 12:07:01 +01:00
mlyashko
953aafbd3d Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix 2014-03-25 14:52:39 +04:00
mlyashko
f38fe76025 added perf test for CalcBackProj 2014-03-25 14:50:37 +04:00
Roman Donchenko
da7a605224 Merge pull request #2123 from white-pony:vkysenko/fix-mertens 2014-03-25 14:37:56 +04:00
Andrey Pavlenko
c1acbb02bc disabling calls to SURF_OCL causing tests failures 2014-03-25 14:09:49 +04:00
Andrey Pavlenko
63a746c6ea fixing conditional compilation 2014-03-25 13:16:42 +04:00
Andrey Pavlenko
7e03a8b279 fixing check_docs2.py issue 2014-03-25 13:15:56 +04:00
Andrey Pavlenko
c6199fc3c1 Merge pull request #2526 from KonstantinMatskevich:ocl_morph_fix 2014-03-25 12:59:10 +04:00
Roman Donchenko
85cf2d9671 Merge pull request #2524 from SpecLad:merge-2.4 2014-03-25 12:13:04 +04:00
Konstantin Matskevich
67926fa028 ocl morphology fix 2014-03-25 10:39:50 +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
Roman Donchenko
8af175b81b Merge pull request #2521 from atrebbi:#3620 2014-03-24 18:54:00 +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
e2c6ab0166 refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0 2014-03-24 14:42:51 +04:00
Ilya Lavrenov
b6833fdde7 added 3-channels support to cv::medianBlur 2014-03-24 14:32:31 +04:00
Ilya Lavrenov
a51ab99a79 added 3-channels support to cv::filter2D, cv::Laplacian 2014-03-24 14:32:31 +04:00
Ilya Lavrenov
e19c42dded added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter 2014-03-24 14:31:42 +04:00
Ilya Lavrenov
8f5fd44fb2 added 3 channels support to cv::bilateralFilter
Conflicts:
	modules/imgproc/test/ocl/test_filters.cpp
2014-03-24 14:31:41 +04:00
Roman Donchenko
f8a100f3e0 Merge pull request #2520 from vlkolesnikov:misprint_fix 2014-03-24 14:05:18 +04:00
Ilya Lavrenov
6ba60a1e22 added 3-channels support to cv::Canny 2014-03-24 13:02:54 +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
623b1db8d1 Merge pull request #2515 from apavlenko:perf_default_strategy 2014-03-24 12:02:30 +04:00
Vladimir Kolesnikov
60803afe8f Misprint fixed in table formatter 2014-03-24 11:04:49 +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
Andrey Pavlenko
259b9e093c disabling failing tests 2014-03-24 10:12:02 +04:00
Andrey Pavlenko
5421d741bc making OCL tests conform to the comon style 2014-03-24 10:08:44 +04:00
Alessandro Trebbi
c4a63f6a86 - 2014-03-23 22:00:16 +01:00
Ilya Lavrenov
20b6191842 doc fix 2014-03-23 16:20:00 +04:00
Koji Miyazato
0a5d6e10b9 Added test code for I/O of user-defined types. 2014-03-22 00:32:44 +09: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
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
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
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
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
Alexander Karsakov
b14c314fc3 Fixed incorrect thread synchronizations 2014-03-20 13:03:03 +04:00
Roman Donchenko
68c57a1e82 Merge pull request #2473 from euphrat:mog2_weight_bugfix 2014-03-20 12:40:23 +04:00
Ilya Lavrenov
eb8b4c58c7 fixed bug in cv::ocl::predictOptimalVectorWidth 2014-03-20 00:28:21 +04:00
krodyush
65d64af2a8 ocl_calcOpticalFlowPyrLK optimizations
1. decrease branch number in CL code by replacing them into weights
2. decrease local mem pressure in reduce operation by using private variables
3. decrease image sampler pressure by caching data into local memory
4. remove unnecessary sync point on the HOST side.
2014-03-19 19:31:14 +04:00
Ilya Lavrenov
291458a859 generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support 2014-03-19 18:56:16 +04:00
Alexander Karsakov
30a8308f8e Enabled Intel-specific optimizations for HOG detector. 2014-03-19 17:30:13 +04:00
Ilya Lavrenov
b449b0bf71 simplified cv::sepFilter2D OpenCL part 2014-03-19 15:59:00 +04:00
Roman Donchenko
a1e5bd71f1 Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control 2014-03-19 14:49:22 +04:00
Ilya Lavrenov
b73490f86c eliminated restriction src[i].channels() == 1 in cv::merge 2014-03-19 13:56:31 +04:00
Andrey Pavlenko
a2dec6c34e Merge pull request #2493 from ilya-lavrenov:tapi_fnlm 2014-03-19 12:56:11 +04:00
Konstantin Matskevich
f9f730c426 update error message 2014-03-19 12:14:48 +04:00
Ilya Lavrenov
04884ebf45 added 3-channels support to cv::setIdentity 2014-03-19 01:53:53 +04:00
Ilya Lavrenov
d1cfcfcafd added 3-channels support to morphology operations 2014-03-18 20:15:11 +04:00
Ilya Lavrenov
8d97d0d631 added 3-channels support to cv::flip 2014-03-18 19:31:37 +04:00
Firat Kalaycilar
0a16d93e1d Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in the CUDA and OCL versions of BackgroundSubtractorMOG2 2014-03-18 17:26:24 +02:00
Koji Miyazato
a43ef9a6cd WriteStructContext treats state of fs 2014-03-18 23:29:30 +09:00
Alexander Smorkalov
b4e4f13f9e Superres module enabled for Android. GPU samples build fixed for Android. 2014-03-18 17:07:19 +04:00
Roman Donchenko
b70332d806 Merge pull request #1986 from GregoryMorse:patch-3 2014-03-18 16:18:33 +04:00
Firat Kalaycilar
4d9698a4cf Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_weight_bugfix 2014-03-18 14:00:30 +02:00
Andrey Pavlenko
6e44f05e6f Merge pull request #2464 from KonstantinMatskevich:ocl_stereobm_experiment 2014-03-18 15:53:09 +04:00
Konstantin Matskevich
eebf92ba58 fix for incorrect opencl device selection 2014-03-18 15:47:35 +04:00
Roman Donchenko
bff92da970 Merge pull request #2488 from Nerei:minor_doc 2014-03-18 15:41:20 +04:00
Roman Donchenko
d76226e21b Merge pull request #2456 from kurodash:pr_use_cvAlloc 2014-03-18 14:39:40 +04:00
Ilya Lavrenov
6fe71bd27c added 4 channels support to fnlm 2014-03-18 14:29:02 +04:00
Roman Donchenko
ae2b0b0098 Merge pull request #2486 from SpecLad:merge-2.4 2014-03-18 13:55:57 +04:00
Roman Donchenko
bfb1ba371c Merge pull request #2026 from pemmanuelviel:giveFurthestPoint 2014-03-18 13:40:44 +04:00
Ilya Lavrenov
82e6edfba2 optimized sep filter 2014-03-18 00:16:38 +04:00
Ilya Lavrenov
3940b6163b remove intel guard since the code is 2 times faster on AMD too 2014-03-17 19:11:21 +04:00
yash
51cb6998ea made the example consistent with the fuction definition and improved doc
made the example consistent with the fuction definition and improved doc
2014-03-17 18:44:02 +05:30
Anatoly Baksheev
0c02e5de25 minor doc fix 2014-03-17 17:02:49 +04:00
vbystricky
6890aa0033 Fix problems on Intel HD graphics 2014-03-17 16:03:15 +04:00
Roman Donchenko
40a740ff88 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
2014-03-17 14:14:07 +04:00
Andrey Pavlenko
dc28451b8a Merge pull request #2479 from alalek:ocl_compare_scalar 2014-03-17 14:04:22 +04:00
Andrey Pavlenko
2a1d5c6d43 Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels 2014-03-17 13:10:34 +04:00
Alexander Alekhin
af062b7c42 ocl: compare: remove useless perf tests 2014-03-17 12:33:12 +04:00
Roman Donchenko
882971151d Merge pull request #2485 from Nerei:viz_correct_viewer_pose 2014-03-17 11:59:14 +04:00
Roman Donchenko
136e5eb804 Merge pull request #2484 from berak:mat_doc_24 2014-03-17 11:57:10 +04:00
Konstantin Matskevich
1a43ed9893 finalizing 2014-03-17 10:42:19 +04:00
Anatoly Baksheev
24d8cbf940 Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry) 2014-03-16 20:07:05 +04:00
berak
80708008a4 missing () on Mat::type() 2014-03-16 14:04:05 +01:00
Alexander Alekhin
7ce2ca2e0c ocl: workaround for Pow accuracy test failure 2014-03-14 19:51:19 +04:00
Alexander Alekhin
9cafd50160 ocl: fixes 2014-03-14 19:51:19 +04:00
Alexander Alekhin
755ca4b7cf ocl: compare with scalar 2014-03-14 19:51:19 +04:00
Andrey Pavlenko
dd6cf15a39 Merge pull request #2481 from akarsakov:fix_hog_intel 2014-03-14 19:17:03 +04:00
Andrey Pavlenko
bcb938efbb Merge pull request #2483 from ilya-lavrenov:tapi_3_vs_4 2014-03-14 19:14:35 +04:00
Andrey Pavlenko
c72a0a1295 Merge pull request #2482 from ilya-lavrenov:tapi_fix 2014-03-14 19:08:07 +04:00
Andrey Pavlenko
6b434befc9 Merge pull request #2480 from vpisarev:ocl_orb 2014-03-14 19:04:19 +04:00
Konstantin Matskevich
af1084eb58 speedUp 2014-03-14 18:00:13 +04:00
Konstantin Matskevich
91e4334227 temp 2014-03-14 18:00:12 +04:00
Konstantin Matskevich
18a59b48ba fixes 2014-03-14 18:00:12 +04:00
Konstantin Matskevich
ddc235172e new approach 2014-03-14 18:00:11 +04:00
Konstantin Matskevich
a5d989f346 new attempt 2014-03-14 18:00:11 +04:00
Konstantin Matskevich
799d7e7a50 bad experiment =( 2014-03-14 18:00:10 +04:00
Konstantin Matskevich
0904f10ab5 optimizations 2014-03-14 18:00:10 +04:00
Konstantin Matskevich
bfc843a5f5 added optimization 2014-03-14 18:00:09 +04:00
Konstantin Matskevich
b5f717b6b3 stereoBM 2014-03-14 18:00:09 +04:00
Ilya Lavrenov
6f12f1b3b5 added 3 vs 4 channels performance tests 2014-03-14 17:30:14 +04:00
Ilya Lavrenov
6be7869ae8 fix for unsupported doubles 2014-03-14 16:54:52 +04:00