krodyush
|
4ca695cab0
|
Merge remote-tracking branch 'github/master' into pullreq/140319-PyrLKOpticalFlow
Conflicts:
modules/video/src/opencl/pyrlk.cl
|
11 years ago |
Vladislav Vinogradov
|
f8d922ad3e
|
disable gpu::GeneralizedHough compilation on gcc 4.7
|
11 years ago |
Andrey Pavlenko
|
5a3200d513
|
Merge pull request #2567 from apavlenko:fix_compare_scalar
|
11 years ago |
Andrey Pavlenko
|
9a3895d842
|
Merge pull request #2556 from DeanF:master
|
11 years ago |
Andrey Pavlenko
|
271f60ba7a
|
fixing OCL run condition (build program failure for comparison 64F Mat with Scalar)
|
11 years ago |
Alexander Alekhin
|
bfc546d23c
|
enable IPP ICV support
|
11 years ago |
Elena Gvozdeva
|
037ac27ec8
|
Added SharedMatrix
|
11 years ago |
Alexander Karsakov
|
2cf3a6e26c
|
Fixed error in case corners not found
|
11 years ago |
Andrey Pavlenko
|
2aab7b2926
|
Merge pull request #2557 from ilya-lavrenov:tapi_fnlm_fix
|
11 years ago |
Roman Donchenko
|
c165f07319
|
Merge pull request #2550 from SpecLad:merge-2.4
|
11 years ago |
Ilya Lavrenov
|
2cd51c04e4
|
fixed condition in cv::FNLM
|
11 years ago |
DeanF
|
48df67a9c5
|
Fixed trailing whitespace
|
11 years ago |
DeanF
|
bdc91c66c9
|
Fixed problem with compilation without HAVE_OPENCL
When compiling without OpenCL, some classes from its namespace are still used in code.
|
11 years ago |
Elena Gvozdeva
|
fa2d79a15b
|
Added IPP Async converters, doc and sample
|
11 years ago |
Andrey Pavlenko
|
6ef94b52ad
|
Merge pull request #2536 from ilya-lavrenov:tapi_resize_linear
|
11 years ago |
Roman Donchenko
|
a8cb5c3983
|
Merge pull request #2554 from asmorkalov:ocv_249_version
|
11 years ago |
Alexander Smorkalov
|
e23f7303a6
|
OpenCV version++. OpenCV Manager version++.
|
11 years ago |
Andrey Pavlenko
|
0d5ffec521
|
Merge pull request #2553 from ilya-lavrenov:typo
|
11 years ago |
Andrey Pavlenko
|
aa3c4ae5d2
|
Merge pull request #2552 from ilya-lavrenov:tapi_compare
|
11 years ago |
Andrey Pavlenko
|
97eac3f394
|
Merge pull request #2551 from ilya-lavrenov:ocl_nonfree
|
11 years ago |
Ilya Lavrenov
|
31f864a22b
|
integer cv::resize (INTER_LINEAR && CV_8UC(cn))
|
11 years ago |
Andrey Pavlenko
|
bb3c0c066c
|
Merge pull request #2548 from jet47:gpu_mog2_test
|
11 years ago |
Ilya Lavrenov
|
9b9769169f
|
doc typos
|
11 years ago |
Andrey Pavlenko
|
d170faeb5c
|
Merge pull request #2549 from ilya-lavrenov:tapi_laplacian
|
11 years ago |
Andrey Pavlenko
|
6c2d77079f
|
Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb
|
11 years ago |
Ilya Lavrenov
|
322b15a459
|
compare with scalar (cn > 1)
|
11 years ago |
Ilya Lavrenov
|
7df92bbb77
|
fixed C4505
|
11 years ago |
Andrey Pavlenko
|
1f4586f3dd
|
Merge pull request #2541 from JinoBetti:2.4
|
11 years ago |
Ilya Lavrenov
|
c53398a438
|
performance tests for FAST
|
11 years ago |
mlyashko
|
5acd178790
|
copyright fix
|
11 years ago |
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
|
11 years ago |
Ilya Lavrenov
|
e1efed1914
|
added support of ksize >= 5 to cv::Laplacian
|
11 years ago |
mlyashko
|
4c5de04efb
|
bug fix
|
11 years ago |
Vladislav Vinogradov
|
6d368dc1e7
|
increase epsilon for MOG2::getBackgroundImage test:
it uses float arithmetics
|
11 years ago |
Andrey Pavlenko
|
51530d4d8e
|
Merge pull request #2543 from apavlenko:24_haar_revert
|
11 years ago |
Roman Donchenko
|
8541b7bf92
|
Merge pull request #2534 from asmorkalov:opencv_config_cut_cuda_abs_path
|
11 years ago |
Alexander Smorkalov
|
b852108262
|
OpenCVConfig.cmake fix after cutting absolute CUDA libraries path.
|
11 years ago |
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
|
11 years ago |
Andrey Pavlenko
|
7d82171af4
|
- fix test
|
11 years ago |
Andrey Pavlenko
|
e6e817e613
|
Revert "Merge pull request #1779 from perping:integral_2.4"
This reverts commit 54ea5bbac7 , reversing
changes made to 28e0d3d771 .
|
11 years ago |
Roman Donchenko
|
0469c18726
|
Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix
|
11 years ago |
Roman Donchenko
|
d6b54ff9d1
|
Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage
|
11 years ago |
Roman Donchenko
|
e055b68ceb
|
Merge pull request #2403 from hbristow:issue-3451
|
11 years ago |
Roman Donchenko
|
0b4534d4c9
|
Merge pull request #2379 from ngryman:optimize_jpeg
|
11 years ago |
Roman Donchenko
|
0c1ab50643
|
Merge pull request #2533 from kenaniah:master
|
11 years ago |
Roman Donchenko
|
f5fecc7e9a
|
Merge pull request #2539 from mjul:fixtypos
|
11 years ago |
Roman Donchenko
|
4382970739
|
Merge pull request #2540 from mjul:fixtypos_2.4
|
11 years ago |
Koji Miyazato
|
1ab8060b62
|
corrected some style errors found by review.
|
11 years ago |
Alexander Smorkalov
|
d17740ec87
|
Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.
|
11 years ago |
Nicolas Gryman
|
da34f1d58c
|
added jpeg with optimized coding support.
|
11 years ago |