f3254b28f2
use clflush replaces clfinish
2013-04-02 14:41:02 +08:00
2a1cf23fab
Merge pull request #713 from bitwangyaoyao:2.4_perf
2013-04-01 15:16:48 +04:00
a3954fb223
Merge pull request #729 from jet47:fix-gpu-windows-build
2013-04-01 15:11:40 +04:00
d619625576
Merge pull request #727 from asmorkalov:android_na_cmake
2013-04-01 15:11:25 +04:00
aebffb712a
Merge pull request #726 from jet47:fix-pvs-studio-warnings
2013-04-01 15:11:02 +04:00
52fc9f7794
Merge pull request #725 from taka-no-me:fix_array_create
2013-04-01 15:10:49 +04:00
8e10cd8946
fixed gpu module compilation under windows
2013-04-01 14:15:06 +04:00
f2fe89c6d8
CMakeLists.txt for Android native activity added.
2013-04-01 12:38:26 +04:00
b62cf65b91
fixed inconsistent new/delete operators
2013-04-01 11:55:02 +04:00
3d095ccc82
fixed condition in KeyPointsFilter::retainBest
2013-04-01 11:53:43 +04:00
d27d091e59
fixed mind/maxd search in CvFuzzyMeanShiftTracker::SearchWindow::initDepthValues
2013-04-01 11:53:05 +04:00
43f38df1d2
fixed incorrect sizeof() expression in CvCalibFilter::SetCameraCount
2013-04-01 11:37:48 +04:00
3c86788b1f
fixed incorrect sizeof() expression in CvCaptureCAM_VFW::open
2013-04-01 11:35:33 +04:00
d2b093d809
fixed potential dereference of null pointer
2013-04-01 11:31:56 +04:00
ce2284e2e6
removed duplication
2013-04-01 11:29:13 +04:00
5a4fa4607b
fixed misprint in imgwarp.cpp
2013-04-01 11:26:49 +04:00
ae47b8f06c
fixed misprint in icvCreateIsometricImage
2013-04-01 11:23:27 +04:00
10774ff068
removed unnecessary tmp variable (convertTo can work in-place)
2013-04-01 11:18:30 +04:00
b28677bd90
fixed misprint in MatOp::augAssignXor
2013-04-01 11:16:47 +04:00
87bb7ff558
Merge pull request #721 from jet47:tvl1-bug-fix
2013-03-31 13:46:25 +04:00
6bf0181d87
Merge pull request #723 from virtuald:2.4
2013-03-31 13:45:55 +04:00
ea5225ef3e
Fix typo leading to heap corruption in OutputArray::create
2013-03-31 13:40:09 +04:00
b08432cfe7
Port dft.py sample from cv to cv2
2013-03-29 17:37:00 -04:00
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
2013-03-29 18:29:40 +04:00
f5c3cb8b7c
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -(cherry picked from commit 0d49de51b7
2013-03-29 18:29:29 +04:00
7d37625fc3
Merge pull request #718 from apavlenko:java_tests_fix
2013-03-29 18:21:14 +04:00
56d62118d5
Merge pull request #707 from pengx17:2.4_surf
2013-03-29 18:20:45 +04:00
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
2013-03-29 18:20:27 +04:00
924b0ef786
fixed bug in TVL1 optical flow:
...
initial optical flow was not cleaned during the second call
2013-03-29 10:40:28 +04:00
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
cdddecbb93
Merge pull request #715 from pengx17:2.4_canny_buf
2013-03-27 13:19:40 +04:00
db17382d3a
Merge pull request #712 from apavlenko:fix-2912
2013-03-27 13:19:27 +04:00
04a6ab4144
Fix OCL Canny
2013-03-27 15:08:51 +08:00
f2ecf4f905
Disable ocl::SURF accurate test
2013-03-27 13:25:08 +08:00
5539e85a11
use perf test replace performance sample
2013-03-27 12:04:48 +08:00
ad58c084a9
Fix compiler errors
2013-03-27 08:56:31 +08:00
bbf43e8b16
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
2013-03-26 19:31:16 +04:00
6c99b5c9e5
Merge pull request #705 from bitwangyaoyao:2.4_oclFix
2013-03-26 18:38:36 +04:00
6a6ae355b1
Merge pull request #710 from jet47:gpu-fix-compilation-issues
2013-03-26 15:31:22 +04:00
8ffc15371d
Fix compiler errors
2013-03-26 17:23:38 +08:00
7476bf5cd7
Fix compiler errors
2013-03-26 16:40:30 +08:00
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
9698079ca5
Pass warp size into SURF
2013-03-26 15:48:15 +08:00
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
d6f1ad8c14
more fix
2013-03-26 14:23:26 +08:00
f36db3a037
more fix of mismatch
2013-03-26 14:10:29 +08:00
ad6aae4583
more fix of mismatch functions on CPU OCL
2013-03-26 13:41:13 +08:00
2c06e59a69
fix some mismatch
2013-03-26 13:05:01 +08:00
f428d1874a
discard comments in kernels.cpp
2013-03-26 12:01:01 +08:00
f7b40cdc63
Add a macro to call additional barrier function on the fly
2013-03-26 11:51:02 +08:00
yao