Maks Naumov
|
9b52b61451
|
remove unused variable in HOGDescriptor::groupRectangles()
|
11 years ago |
Maks Naumov
|
a01659825c
|
remove unused variable in loadFromXML()
|
11 years ago |
Maks Naumov
|
c098c18942
|
Merge pull request #1 from Itseez/2.4
2.4
|
11 years ago |
Roman Donchenko
|
1cee868e88
|
Merge pull request #2572 from jet47:gpu-generalized-hough
|
11 years ago |
Vladislav Vinogradov
|
d822d6f101
|
disable GeneralizedHough tests on gcc 4.7
|
11 years ago |
Vladislav Vinogradov
|
f8d922ad3e
|
disable gpu::GeneralizedHough compilation on gcc 4.7
|
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
|
97eac3f394
|
Merge pull request #2551 from ilya-lavrenov:ocl_nonfree
|
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 |
Ilya Lavrenov
|
7df92bbb77
|
fixed C4505
|
11 years ago |
Andrey Pavlenko
|
1f4586f3dd
|
Merge pull request #2541 from JinoBetti:2.4
|
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
|
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 |
Alexander Smorkalov
|
d17740ec87
|
Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.
|
11 years ago |
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
|
11 years ago |
Roman Donchenko
|
2e3e106676
|
Merge pull request #2537 from ilya-lavrenov:doc_fix
|
11 years ago |
Martin Jul
|
a1798cb28e
|
Fixed typo in BFMatcher in docs.
|
11 years ago |
Ilya Lavrenov
|
80df44bd75
|
doc fix
|
11 years ago |
Martin Jul
|
bb05af8ece
|
Merge branch '2.4' into fixtypos
|
11 years ago |
Martin Jul
|
73042b32e1
|
Fixed typos in "matching"
|
11 years ago |
Andrey Pavlenko
|
a1d151924d
|
Merge pull request #2527 from apavlenko:ocl_surf_24
|
11 years ago |
Andrey Pavlenko
|
fa5705613d
|
splitting plain and OCL tests for SURF.
|
11 years ago |
Roman Donchenko
|
a7f9677378
|
Merge pull request #2404 from yashdv:old_basic_structures_doc_fix
|
11 years ago |
Andrey Pavlenko
|
c1acbb02bc
|
disabling calls to SURF_OCL causing tests failures
|
11 years ago |
Andrey Pavlenko
|
63a746c6ea
|
fixing conditional compilation
|
11 years ago |
Andrey Pavlenko
|
7e03a8b279
|
fixing check_docs2.py issue
|
11 years ago |
Roman Donchenko
|
5effebb5f5
|
Merge pull request #2498 from dreamworld:fix_tutorial_mat_the_basic_image_container
|
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 |
Daniil Osokin
|
ac19420907
|
Removed obsolete list from docs
|
11 years ago |
Roman Donchenko
|
f8a100f3e0
|
Merge pull request #2520 from vlkolesnikov:misprint_fix
|
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 |
Vladimir Kolesnikov
|
60803afe8f
|
Misprint fixed in table formatter
|
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 |