Andrey Kamaev
|
058a9ab136
|
Merge pull request #784 from jet47:fix-gpu-build
|
2013-04-08 15:11:16 +04:00 |
|
marina.kolpakova
|
780a8cc149
|
fix build without gpu module with cuda
|
2013-04-08 14:13:19 +04:00 |
|
Vladislav Vinogradov
|
bf6c08a9ea
|
fixed compilation with CUDA
|
2013-04-08 13:29:04 +04:00 |
|
peng xiao
|
143f8f69d6
|
Add some documentation on ocl::convolve
|
2013-04-08 17:15:52 +08:00 |
|
peng xiao
|
3fea2620e6
|
Fix some compilation errors and warnings.
|
2013-04-08 16:22:20 +08:00 |
|
Andrey Kamaev
|
d3083ecf6d
|
Fix bitness detection for target platform
|
2013-04-08 11:25:36 +04:00 |
|
peng xiao
|
77501f3ed0
|
ocl: Add dft based convolve implementation.
Match template in ocl module now can be utilized with dft based
convolve. Note this feature needs OpenCV to be built with clAmdFft
library.
|
2013-04-08 15:19:44 +08:00 |
|
Andrey Kamaev
|
6ef43cd96e
|
Merge pull request #779 from sivapvarma:master
|
2013-04-08 10:11:33 +04:00 |
|
Andrey Kamaev
|
5cfb6a848e
|
Merge pull request #780 from sivapvarma:2.4
|
2013-04-08 10:11:16 +04:00 |
|
yao
|
7726e273a9
|
merge add and sub into one set of kernels
|
2013-04-06 13:37:36 +08:00 |
|
Andrey Kamaev
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
Siva Prasad Varma
|
e2df8c7e62
|
Fix bug #2590
replaced wrong check to correct check
|
2013-04-05 19:09:09 +05:30 |
|
yao
|
bee970ab94
|
remove the C3 kernels in arithm, as the oclMat will never store 3 channels data
|
2013-04-05 21:29:29 +08:00 |
|
Siva Prasad Varma
|
3b0ce8e132
|
Add HoughTransform examples python2
houghlines.py for HoughLinesP() and HoughLines()
houghcircles.py for HoughCircles()
|
2013-04-05 14:32:07 +05:30 |
|
Andrey Kamaev
|
74e5ff2ec7
|
Merge pull request #778 from asmorkalov:android_wanr_fix
|
2013-04-05 13:00:20 +04:00 |
|
Andrey Kamaev
|
72e49dc790
|
Merge pull request #777 from taka-no-me:ocl_win_hang
|
2013-04-05 13:00:03 +04:00 |
|
Andrey Kamaev
|
a2d27429e4
|
Merge pull request #775 from bitwangyaoyao:2.4_fixerr
|
2013-04-05 12:59:45 +04:00 |
|
Andrey Kamaev
|
977562b614
|
Merge pull request #771 from gpsinghsandhu:surfFeatureFinder
|
2013-04-05 12:59:22 +04:00 |
|
Andrey Kamaev
|
3b6a82b57c
|
Merge pull request #769 from apavlenko:fix_2901
|
2013-04-05 12:59:02 +04:00 |
|
Alexander Smorkalov
|
f89cc191a4
|
Waning fixes for Android samples
|
2013-04-05 12:17:45 +04:00 |
|
Andrey Kamaev
|
5163986e7d
|
Merge pull request #772 from gpsinghsandhu:featureDescriptionTutorials
|
2013-04-05 11:46:06 +04:00 |
|
Andrey Kamaev
|
3400d83778
|
Workaround hanging of ocl module when ocl API in not really used
|
2013-04-05 11:01:28 +04:00 |
|
Andrey Pavlenko
|
4c31c26acf
|
fix for #2901 (en exception was raised when getting empty MatOfDMatch)
|
2013-04-05 08:50:37 +04:00 |
|
Andrey Pavlenko
|
09fe5cddf1
|
test for the issue #2901
|
2013-04-05 08:50:24 +04:00 |
|
Andrey Pavlenko
|
18b2d6bdbb
|
copying '.classpath' and '.project' to build dir, useful for opening in eclipse
|
2013-04-05 08:50:08 +04:00 |
|
Dustin Spicuzza
|
64b5784c0b
|
Catch exceptions when large allocations fail
|
2013-04-05 00:43:10 -04:00 |
|
yao
|
8cc5b98051
|
Fix the problem of device selection on hybrid video systems.
|
2013-04-05 09:19:59 +08:00 |
|
yao
|
5022bc8c25
|
move the "cpu device checking" from supportsFeatures() to queryDeviceInfo()
|
2013-04-05 09:17:14 +08:00 |
|
yao
|
bcc086baa9
|
fix all redefine build errors on some Intel OCL
|
2013-04-05 08:15:05 +08:00 |
|
Gurpinder Singh Sandhu
|
87b84a4197
|
another update
|
2013-04-04 23:13:03 +05:30 |
|
Gurpinder Singh Sandhu
|
d51d05fc44
|
Feature description tutorials made in sync with sample code
sample code : https://github.com/Itseez/opencv/blob/master/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
Bug #2888
|
2013-04-04 23:12:18 +05:30 |
|
Gurpinder Singh Sandhu
|
69127e4105
|
some typo
|
2013-04-04 22:54:27 +05:30 |
|
Gurpinder Singh Sandhu
|
2b1e13f8f4
|
changed surfFeaturesFinder::find() to allow CV_8UC1 type images
http://code.opencv.org/issues/2926
|
2013-04-04 22:52:07 +05:30 |
|
Andrey Kamaev
|
652606f780
|
Merge pull request #770 from asmorkalov:winrt
|
2013-04-04 20:01:55 +04:00 |
|
Andrey Kamaev
|
80fed87d53
|
Merge pull request #760 from alekcac:2.4
|
2013-04-04 18:44:35 +04:00 |
|
Alexander Smorkalov
|
a914088f29
|
Build warning fixes.
|
2013-04-04 07:29:53 -07:00 |
|
Andrey Kamaev
|
3785439917
|
Merge pull request #763 from gpsinghsandhu:video-doc-minor-typo
|
2013-04-04 18:16:15 +04:00 |
|
Andrey Kamaev
|
bfac291838
|
Merge pull request #757 from jackculpepper:master
|
2013-04-04 18:15:03 +04:00 |
|
Andrey Kamaev
|
6570215205
|
Merge pull request #767 from asmorkalov:version_increment
|
2013-04-04 18:00:44 +04:00 |
|
Andrey Kamaev
|
c34820b53a
|
Merge pull request #766 from taka-no-me:try_compile_fix
|
2013-04-04 18:00:23 +04:00 |
|
Andrey Kamaev
|
1d7ff721ed
|
Merge pull request #764 from taka-no-me:svd
|
2013-04-04 17:59:57 +04:00 |
|
Andrey Kamaev
|
579f723fc6
|
Merge pull request #762 from vpisarev:cvt_fix
|
2013-04-04 17:59:28 +04:00 |
|
Andrey Kamaev
|
7c402d1e15
|
Merge pull request #759 from asmorkalov:android_common_fixes
|
2013-04-04 17:58:44 +04:00 |
|
Andrey Kamaev
|
e7885bb8e4
|
Merge pull request #758 from taka-no-me:do_not_use_opengl_without_ui
|
2013-04-04 17:57:38 +04:00 |
|
Andrey Kamaev
|
6f288615a2
|
Merge pull request #756 from taka-no-me:libavcodec53.25.0
|
2013-04-04 17:57:17 +04:00 |
|
Andrey Kamaev
|
6a0f605f51
|
Merge pull request #755 from taka-no-me:add_checkinclude
|
2013-04-04 17:56:53 +04:00 |
|
Andrey Kamaev
|
e22983ddb6
|
Merge pull request #753 from taka-no-me:fix_osx_fat_java
|
2013-04-04 17:55:28 +04:00 |
|
Alexander Smorkalov
|
1e332d690f
|
OpenCV verison incremented
OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.
|
2013-04-04 15:50:36 +04:00 |
|
Andrey Kamaev
|
fa64f28c6b
|
Fix binary directory used in CMake try_compile commands
Old paths can have problems with cross-compilation
|
2013-04-04 15:43:49 +04:00 |
|
Alexander Shishkov
|
35f75147b0
|
removed willowgarage.com links
|
2013-04-04 14:33:00 +04:00 |
|