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
Andrey Pavlenko
5421d741bc
making OCL tests conform to the comon style
11 years ago
Alessandro Trebbi
c4a63f6a86
-
11 years ago
Ilya Lavrenov
20b6191842
doc fix
11 years ago
Alexander Smorkalov
64d679ecb4
Added guard to prevent from gpu module redefinition in OpenCV.mk
11 years ago
Kang Liu
9dc51a1aa4
Keep definitions of link aliases consistent
11 years ago
Daniil Osokin
2d3aa3861c
Fixed Load, Modify, and Save an Image tutorial
11 years ago
Andrey Pavlenko
244f126ff6
Merge pull request #2454 from apavlenko:2.4_haar_extend
11 years ago
Alexander Smorkalov
3b65b710b6
Implicit linkage with CUDA runtime reverted.
11 years ago
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.
11 years ago
Roman Donchenko
46d39aff68
Merge pull request #2501 from asmorkalov:android_native_camera_qualcomm
11 years ago
Roman Donchenko
6bf4a7ce01
Merge pull request #2510 from asmorkalov:android_cuda_filter_fix
11 years ago
Kang Liu
dc21e2cc0e
remove highlighting in some function links
...
1. Remove whole-document highlighting in some function links
2. fix the function alias `readwriteimagevideo`
11 years ago
Andrey Pavlenko
fe5eaae102
adding missing include (fixing 'no ocl implementation' error)
11 years ago
Alexander Smorkalov
846266fde4
Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
11 years ago
Roman Donchenko
49efc250d3
Merge pull request #2400 from RJ2:Bugfix_2
11 years ago
Roman Donchenko
a66018d14d
Merge pull request #2423 from RJ2:bugfix_5
11 years ago