Misty De Meo
e143706ef9
Fix ant/Java detection in cmake scripts
...
Mac OS X 10.7 and newer don't come with Java installed. They do
include some stub binaries, which ask the user if they want to
install Java when run.
OpenCV's cmake script just checks for the existence of an ant
binary and assumes that Java's available if ant is. As a result,
cmake will configure the build to use Java and it will fail once
it tries to compile the Java bindings.
This fixes the issue by checking for the exit status of
`ant -version` - it exits 0 if Java is installed, or 1
otherwise.(cherry picked from commit a423afddc1
)
12 years ago
Ryan Rawson
f5c3cb8b7c
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -(cherry picked from commit 0d49de51b7
)
12 years ago
Andrey Kamaev
7d37625fc3
Merge pull request #718 from apavlenko:java_tests_fix
12 years ago
Andrey Kamaev
56d62118d5
Merge pull request #707 from pengx17:2.4_surf
12 years ago
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
12 years ago
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
)
12 years ago
Andrey Kamaev
cdddecbb93
Merge pull request #715 from pengx17:2.4_canny_buf
12 years ago
Andrey Kamaev
db17382d3a
Merge pull request #712 from apavlenko:fix-2912
12 years ago
peng xiao
04a6ab4144
Fix OCL Canny
12 years ago
peng xiao
f2ecf4f905
Disable ocl::SURF accurate test
12 years ago
peng xiao
ad58c084a9
Fix compiler errors
12 years ago
Andrey Pavlenko
bbf43e8b16
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
12 years ago
Andrey Kamaev
6c99b5c9e5
Merge pull request #705 from bitwangyaoyao:2.4_oclFix
12 years ago
Andrey Kamaev
6a6ae355b1
Merge pull request #710 from jet47:gpu-fix-compilation-issues
12 years ago
peng xiao
8ffc15371d
Fix compiler errors
12 years ago
peng xiao
7476bf5cd7
Fix compiler errors
12 years ago
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
12 years ago
peng xiao
9698079ca5
Pass warp size into SURF
12 years ago
peng xiao
0c19a07bf4
Add a function to query ocl device info
...
Currently the function only supports wavefront size query
12 years ago
yao
d6f1ad8c14
more fix
12 years ago
yao
f36db3a037
more fix of mismatch
12 years ago
yao
ad6aae4583
more fix of mismatch functions on CPU OCL
12 years ago
yao
2c06e59a69
fix some mismatch
12 years ago
yao
f428d1874a
discard comments in kernels.cpp
12 years ago
peng xiao
f7b40cdc63
Add a macro to call additional barrier function on the fly
12 years ago
yao
7e495a1d66
fix amdFft and amdBlas path
12 years ago
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
12 years ago
Andrey Kamaev
55c9a7c87d
Merge pull request #701 from jet47:clahe
12 years ago
Vladislav Vinogradov
4d23e2c8c9
GPU implementation of CLAHE
12 years ago
Vladislav Vinogradov
5810a73d30
CPU implementation of CLAHE
12 years ago
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
12 years ago
Andrey Kamaev
04ec0bdbf0
Merge pull request #697 from Nerei/ios_png_jpeg
...
Enabled png and jpeg for iOS
12 years ago
Anatoly Baksheev
7fa01e3fcc
enabled png and jpeg for iOS
12 years ago
Vadim Pisarevsky
2be7d9b4d5
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
12 years ago
Andrey Kamaev
ec8aec09ec
Merge pull request #691 from vpisarev:fix_2899
12 years ago
Andrey Kamaev
2c9f651230
Merge pull request #688 from jet47:fix-nonfree-compilation
12 years ago
Andrey Kamaev
c6eb7c3b12
Merge pull request #683 from jet47:gpu-license
12 years ago
Vadim Pisarevsky
a4815cf359
removed extra whitespaces
12 years ago
Vadim Pisarevsky
38693ef37c
fixed http://code.opencv.org/issues/2899
12 years ago
Vadim Pisarevsky
5febc07b6b
Merge pull request #687 from vpisarev:fast_lin_svm2
12 years ago
Vladislav Vinogradov
f0b19d4659
updated license header in whole gpu module
12 years ago
Vladislav Vinogradov
3ef2e1136f
fixed nonfree compilation with gpu (perf tests)
12 years ago
Vadim Pisarevsky
e01335bf47
fixed buffer size and restored the use of compressed files in ml's load_save tests.
12 years ago
Andrey Kamaev
b6365699ee
Merge pull request #664 from taka-no-me/ocl
...
Move OpenCL SURF to nonfree module
12 years ago
Andrey Kamaev
07cd18adaf
Merge pull request #686 from taka-no-me/stereobm_sobel
...
Fixed wrong index in prefilterXSobel function
12 years ago
Andrey Kamaev
8a962d348e
Merge pull request #676 from vpisarev/svd_stuff
...
added test for bug #1448 and hopefully fixes the bug #2898
12 years ago
Andrey Kamaev
172b4554f3
Merge pull request #675 from jet47/gpu-test-fixes
...
GPU test fixes
12 years ago
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)
12 years ago
Andrey Kamaev
4bd721ad3b
Fix build errors
12 years ago
Dong Nguyen
73f5697749
Fixed wrong in row index of SSE implementation in prefilterXSobel function.
12 years ago