Andrey Kamaev
7d37625fc3
Merge pull request #718 from apavlenko:java_tests_fix
2013-03-29 18:21:14 +04:00
Andrey Kamaev
56d62118d5
Merge pull request #707 from pengx17:2.4_surf
2013-03-29 18:20:45 +04:00
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
2013-03-29 18:20:27 +04:00
Alexander Bohn / FI$H2k
c66cf08ced
Fix for encoding errors when building Java source
...
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
(cherry picked from commit f3ee55e042
2013-03-27 17:43:00 +04:00
Andrey Kamaev
cdddecbb93
Merge pull request #715 from pengx17:2.4_canny_buf
2013-03-27 13:19:40 +04:00
Andrey Kamaev
db17382d3a
Merge pull request #712 from apavlenko:fix-2912
2013-03-27 13:19:27 +04:00
peng xiao
04a6ab4144
Fix OCL Canny
2013-03-27 15:08:51 +08:00
peng xiao
f2ecf4f905
Disable ocl::SURF accurate test
2013-03-27 13:25:08 +08:00
peng xiao
ad58c084a9
Fix compiler errors
2013-03-27 08:56:31 +08:00
Andrey Pavlenko
bbf43e8b16
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
2013-03-26 19:31:16 +04:00
Andrey Kamaev
6c99b5c9e5
Merge pull request #705 from bitwangyaoyao:2.4_oclFix
2013-03-26 18:38:36 +04:00
Andrey Kamaev
6a6ae355b1
Merge pull request #710 from jet47:gpu-fix-compilation-issues
2013-03-26 15:31:22 +04:00
peng xiao
8ffc15371d
Fix compiler errors
2013-03-26 17:23:38 +08:00
peng xiao
7476bf5cd7
Fix compiler errors
2013-03-26 16:40:30 +08:00
Vladislav Vinogradov
4dbd0f0e8f
fixed compilation issues with gpu modules:
...
* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows
2013-03-26 12:33:13 +04:00
peng xiao
9698079ca5
Pass warp size into SURF
2013-03-26 15:48:15 +08:00
peng xiao
0c19a07bf4
Add a function to query ocl device info
...
Currently the function only supports wavefront size query
2013-03-26 15:36:49 +08:00
yao
d6f1ad8c14
more fix
2013-03-26 14:23:26 +08:00
yao
f36db3a037
more fix of mismatch
2013-03-26 14:10:29 +08:00
yao
ad6aae4583
more fix of mismatch functions on CPU OCL
2013-03-26 13:41:13 +08:00
yao
2c06e59a69
fix some mismatch
2013-03-26 13:05:01 +08:00
yao
f428d1874a
discard comments in kernels.cpp
2013-03-26 12:01:01 +08:00
peng xiao
f7b40cdc63
Add a macro to call additional barrier function on the fly
2013-03-26 11:51:02 +08:00
yao
7e495a1d66
fix amdFft and amdBlas path
2013-03-26 11:48:14 +08:00
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +04:00
Andrey Kamaev
55c9a7c87d
Merge pull request #701 from jet47:clahe
2013-03-25 20:26:22 +04:00
Vladislav Vinogradov
4d23e2c8c9
GPU implementation of CLAHE
2013-03-25 17:45:13 +04:00
Vladislav Vinogradov
5810a73d30
CPU implementation of CLAHE
2013-03-25 17:44:31 +04:00
Andrey Kamaev
5c327030eb
Merge pull request #698 from vpisarev/ms_visimage_tut24
...
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
2013-03-25 03:29:13 -07:00
Andrey Kamaev
04ec0bdbf0
Merge pull request #697 from Nerei/ios_png_jpeg
...
Enabled png and jpeg for iOS
2013-03-25 03:28:29 -07:00
Anatoly Baksheev
7fa01e3fcc
enabled png and jpeg for iOS
2013-03-25 11:19:29 +04:00
Vadim Pisarevsky
2be7d9b4d5
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
2013-03-24 23:48:35 +04:00
Andrey Kamaev
ec8aec09ec
Merge pull request #691 from vpisarev:fix_2899
2013-03-22 17:18:55 +04:00
Andrey Kamaev
2c9f651230
Merge pull request #688 from jet47:fix-nonfree-compilation
2013-03-22 17:18:40 +04:00
Andrey Kamaev
c6eb7c3b12
Merge pull request #683 from jet47:gpu-license
2013-03-22 17:18:15 +04:00
Vadim Pisarevsky
a4815cf359
removed extra whitespaces
2013-03-22 15:12:55 +04:00
Vadim Pisarevsky
38693ef37c
fixed http://code.opencv.org/issues/2899
2013-03-22 15:10:54 +04:00
Vadim Pisarevsky
5febc07b6b
Merge pull request #687 from vpisarev:fast_lin_svm2
2013-03-22 14:34:45 +04:00
Vladislav Vinogradov
f0b19d4659
updated license header in whole gpu module
2013-03-22 14:03:15 +04:00
Vladislav Vinogradov
3ef2e1136f
fixed nonfree compilation with gpu (perf tests)
2013-03-22 10:20:57 +04:00
Vadim Pisarevsky
e01335bf47
fixed buffer size and restored the use of compressed files in ml's load_save tests.
2013-03-22 01:53:41 +04:00
Andrey Kamaev
b6365699ee
Merge pull request #664 from taka-no-me/ocl
...
Move OpenCL SURF to nonfree module
2013-03-21 09:01:59 -07:00
Andrey Kamaev
07cd18adaf
Merge pull request #686 from taka-no-me/stereobm_sobel
...
Fixed wrong index in prefilterXSobel function
2013-03-21 08:59:59 -07:00
Andrey Kamaev
8a962d348e
Merge pull request #676 from vpisarev/svd_stuff
...
added test for bug #1448 and hopefully fixes the bug #2898
2013-03-21 08:59:48 -07:00
Andrey Kamaev
172b4554f3
Merge pull request #675 from jet47/gpu-test-fixes
...
GPU test fixes
2013-03-21 08:59:34 -07:00
Vadim Pisarevsky
4331f76d18
add hack to disable optimization of linear svms; improved precision of optimize_linear_svm; add the relevant test, which however requires some big database (so it's disabled by default)
2013-03-21 19:17:59 +04:00
Andrey Kamaev
4bd721ad3b
Fix build errors
2013-03-21 18:37:34 +04:00
Dong Nguyen
73f5697749
Fixed wrong in row index of SSE implementation in prefilterXSobel function.
2013-03-21 18:28:23 +04:00
Andrey Kamaev
1b4afcca30
Move OpenCl SURF perf tests to nonfree and fix build of samples
2013-03-21 18:19:52 +04:00
Andrey Kamaev
77ad07adf3
Disable crashing ocl tests
2013-03-21 18:18:17 +04:00
