Andrey Kamaev
f77a375354
Merge branch '2.4'
12 years ago
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
3ceca9b7b1
Merge pull request #694 from mistydemeo:fix_java_detection
12 years ago
Andrey Kamaev
f4b98e9628
Merge pull request #719 from jet47:gpu-fix-build
12 years ago
Andrey Kamaev
0bb785c979
Merge pull request #717 from ryanobjc:patch-1
12 years ago
Andrey Kamaev
7ff68d5e0d
Merge pull request #711 from taka-no-me:move_keypoint_dmatch
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
Vladislav Vinogradov
2661c2e213
fixed warnings
12 years ago
Vladislav Vinogradov
76e748ccc1
removed internal_header.hpp - it produces many warnings
12 years ago
Vladislav Vinogradov
15f09f8068
fixed gpu module compilation
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
Ryan Rawson
0d49de51b7
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -
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
20534c9beb
Merge pull request #692 from vpisarev:refactor_calib3d_stereo
12 years ago
Andrey Kamaev
2edfae5070
Move documentation for cv::KeyPoint and cv::DMatch to core
12 years ago
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
12 years ago
Andrey Kamaev
6a6ae355b1
Merge pull request #710 from jet47:gpu-fix-compilation-issues
12 years ago
Andrey Kamaev
8eff34ee0b
Merge pull request #709 from taka-no-me:cv_format
12 years ago
Andrey Kamaev
6e2708e042
Merge pull request #708 from taka-no-me:gstreamer_10_28
12 years ago
Andrey Kamaev
0e58853be3
Merge pull request #706 from taka-no-me:str_gpumat
12 years ago
peng xiao
8ffc15371d
Fix compiler errors
12 years ago
Andrey Kamaev
6377922716
Fix build with gstreamer 0.10.28
12 years ago
Vadim Pisarevsky
322d781192
avoid explicit std::string use
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
Andrey Kamaev
2107ea9773
More accurate implementation of cv::format
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
Andrey Kamaev
5fd58a0103
Fix std::string to cv::String migration problems in gpumat.cpp
12 years ago
Andrey Kamaev
69c9fe357d
Merge pull request #702 from taka-no-me:refactor_core_headers
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
98585a9688
Merge pull request #703 from jacob-baines:patch-2
12 years ago
Andrey Kamaev
55c9a7c87d
Merge pull request #701 from jet47:clahe
12 years ago
Andrey Kamaev
aaf69c422e
Fix clang build for Android (CV_XADD)
12 years ago