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
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
Roman Donchenko
a7f9677378
Merge pull request #2404 from yashdv:old_basic_structures_doc_fix
2014-03-26 12:18:39 +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
Roman Donchenko
5effebb5f5
Merge pull request #2498 from dreamworld:fix_tutorial_mat_the_basic_image_container
2014-03-25 12:14:44 +04:00
Roman Donchenko
8af175b81b
Merge pull request #2521 from atrebbi:#3620
2014-03-24 18:54:00 +04:00
Roman Donchenko
4d3f9228aa
Merge pull request #2516 from Daniil-Osokin:fix_docs
2014-03-24 18:52:49 +04:00
Daniil Osokin
ac19420907
Removed obsolete list from docs
2014-03-24 14:50:20 +01:00
Roman Donchenko
f8a100f3e0
Merge pull request #2520 from vlkolesnikov:misprint_fix
2014-03-24 14:05:18 +04:00
Daniil Osokin
04b1822cff
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
2014-03-24 12:53:30 +04:00
Roman Donchenko
bcb0ee3e4b
Merge pull request #2514 from asmorkalov:android_two_libs_cuda
2014-03-24 12:26:57 +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
7efb09fb8f
Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert
2014-03-24 12:03:27 +04:00
Vladimir Kolesnikov
60803afe8f
Misprint fixed in table formatter
2014-03-24 11:04:49 +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
Alexander Smorkalov
64d679ecb4
Added guard to prevent from gpu module redefinition in OpenCV.mk
2014-03-22 05:41:29 +04:00
Kang Liu
9dc51a1aa4
Keep definitions of link aliases consistent
2014-03-21 22:28:48 +01:00
Daniil Osokin
2d3aa3861c
Fixed Load, Modify, and Save an Image tutorial
2014-03-21 16:58:50 +01:00
Andrey Pavlenko
244f126ff6
Merge pull request #2454 from apavlenko:2.4_haar_extend
2014-03-21 18:45:58 +04:00
Alexander Smorkalov
3b65b710b6
Implicit linkage with CUDA runtime reverted.
2014-03-21 17:58:59 +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
Roman Donchenko
46d39aff68
Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm
2014-03-21 16:28:48 +04:00
Roman Donchenko
6bf4a7ce01
Merge pull request #2510 from asmorkalov:android_cuda_filter_fix
2014-03-21 16:00:29 +04:00
Kang Liu
dc21e2cc0e
remove highlighting in some function links
...
1. Remove whole-document highlighting in some function links
2. fix the function alias `readwriteimagevideo`
2014-03-21 11:54:35 +01: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
Roman Donchenko
49efc250d3
Merge pull request #2400 from RJ2:Bugfix_2
2014-03-21 13:58:06 +04:00
Roman Donchenko
a66018d14d
Merge pull request #2423 from RJ2:bugfix_5
2014-03-21 13:54:52 +04:00
Alexander Smorkalov
b0ad84cfa2
Libraries filter update after abs path cut.
2014-03-21 12:48:38 +04:00
Andrey Pavlenko
640e180efe
switching to CV_HAAR_SCALE_IMAGE mode, enabling test
2014-03-20 22:22:55 +04:00
Roman Donchenko
034ef02409
Merge pull request #2449 from asmorkalov:cuda_abs_path_fix
2014-03-20 17:49:41 +04:00
Andrey Pavlenko
9c7ba6db90
Merge pull request #2490 from ilya-lavrenov:ocl_sep_filters
2014-03-20 13:54:27 +04:00
Roman Donchenko
68c57a1e82
Merge pull request #2473 from euphrat:mog2_weight_bugfix
2014-03-20 12:40:23 +04:00
Alexander Smorkalov
284b2fc1e7
Cut path to CUDA libraries to prevent generation of OpenCVModules.cmake with abs path.
2014-03-19 18:47:32 +04:00
Kang Liu
17713f6831
1. fix an error in sample code
...
2. change an external link to maintain consistency with the previous tutorial
2014-03-19 13:05:38 +01:00
Roman Donchenko
a1e5bd71f1
Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control
2014-03-19 14:49:22 +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
Alexander Smorkalov
b4e4f13f9e
Superres module enabled for Android. GPU samples build fixed for Android.
2014-03-18 17:07:19 +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
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