f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
124ede611b
Update with apavlenko's suggestions.
2013-08-14 10:00:09 +08:00
892c088e1b
Some modifications to sortByKey API.
...
Add documentation.
2013-07-30 11:53:25 +08:00
e1f43e3b03
Add sort_by_key for oclMat.
...
Most codes are ported from AMD's Bolt library.
Four methods are implemented:
SORT_BITONIC, // only support power-of-2 buffer size
SORT_SELECTION, // cannot sort duplicate keys
SORT_MERGE,
SORT_RADIX // only support signed int/float keys
2013-07-18 17:25:00 +08:00
241e2d2360
Merge pull request #1077 from bitwangyaoyao:2.4_kmeans
2013-07-10 18:32:14 +04:00
88ed74a7ec
fix the function name
2013-07-05 08:59:21 +08:00
97e620b8f3
Fix oclMat constructor when roi is provided.
2013-07-04 16:14:55 +08:00
8d8dc29ced
add kmeans
2013-07-03 13:13:04 +08:00
6bf8f474fa
Merge pull request #1051 from pengx17:2.4_fback_ocl
2013-07-01 13:45:43 +04:00
a5383b8627
Move function definition from header to cpp.
2013-06-28 10:52:39 +08:00
fc64faa22e
Remove empty cv::ocl::CLAHE class.
2013-06-27 10:06:37 +08:00
132b885b24
Add opencl implementation of Farnback optical flow.
2013-06-26 16:35:19 +08:00
cc3fb3d182
Let CLAHE_OCL reuse cv::CLAHE abstract class.
2013-06-26 10:50:51 +08:00
3bab7391d0
Merge pull request #1028 from SpecLad:ocl-clahe-dtor
2013-06-24 13:18:28 +04:00
290c8db0a8
Revise naming for getOclMat function.
2013-06-21 14:51:23 +08:00
e129638263
Add a workaround to interpolate between oclMat and Input/OutputArray.
2013-06-21 14:05:29 +08:00
1ed5fb937d
Give cv::ocl::CLAHE a virtual destructor, for the usual reasons.
2013-06-19 15:39:11 +04:00
47ea0614dc
Merge pull request #969 from pengx17:2.4_binary_cache
2013-06-14 15:47:23 +04:00
e6b18fc492
Fix a bug caused by NDEBUG macro; it is now removed.
...
Revise some descriptions of the enums.
2013-06-14 16:37:00 +08:00
5fd724b54a
Add a function to query if global OpenCL context is initialized.
2013-06-13 10:46:12 +08:00
c8398c9fdc
Use anonymous enumerations instead of constants
2013-06-11 20:32:55 +08:00
1d8cd3a717
Add ocl CLACH implementation.
...
Test cases (accuracy and performance) are provided.
2013-06-10 18:37:48 +08:00
e77abeef16
Add a new global function to control ocl binary storage
...
Previously the feature is controlled by setBinpath implicitly.
We add the function to cope with setBinpath and setBinpath is only
useful when setBinaryDiskCache is set.
Refer to the header to see more info.
2013-06-10 16:38:22 +08:00
b1c248fcc9
Fix ocl::filter2D.
...
In current implementation, this function only works when anchor point is
in the kernel center and kernel size supported is either 3x3 or 5x5.
2013-05-31 10:53:52 +08:00
fd7ba355ee
Add non-stump based ocl Haar cascade classifier support.
...
For example, haarcascade_frontalface_alt2.xml is now supported.
Note that classifier's pattern of a cascade file must be consistent,
i.e., all trees must either have two nodes or one node, otherwise
unexpected results will occur.
Other fixes:
Test cases are updated.
Some unused codes are removed.
Fix some problems of haar when using OclCascadeClassifierBuf.
2013-05-30 14:01:19 +08:00
006e4242b2
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft
2013-05-29 17:57:14 +08:00
2ccdf56119
Merge pull request #913 from janm399:2.4
2013-05-28 22:05:14 +04:00
46b770f255
Fixed include name in OpenCL on OS X
2013-05-22 13:22:16 +01:00
b4a4a05bdc
Add ocl's good features to track implementation.
...
Additional notes with this commit:
1. Add cornerHarris_dxdy and cornerMinEigenVal_dxdy to get
the interim dx and dy output of Sobel operator;
2. Add minMax_buf to allow user to reuse buffers in minMax;
3. Fix an error when either min or max pointer fed into minMax is NULL;
4. Corner sorter temporarily uses C++ STL's quick sort. A parallel
selection sort in OpneCL is contained in the implementation but disabled
due to poor performance at the moment.
5. Accuracy test for ocl gfft.
2013-05-22 13:46:42 +08:00
cbbc82a789
Merge pull request #882 from pengx17:2.4_rewrite_query_info
2013-05-20 14:01:03 +04:00
4162ebfad3
add OpticalFlowDual_TVL1_OCL function
2013-05-17 15:34:22 +08:00
7d9041460a
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
2013-05-15 14:21:50 +04:00
d053f2165d
Add BFMatcher_OCL class alias for BruteForceMatcher_OCL.
...
This adds a similar interface with pure-cpp and gpu versions.
2013-05-15 10:47:17 +08:00
3f93c3cc4e
Clean up spaces in ocl.hpp
2013-05-15 10:43:47 +08:00
bd1d7cd208
Merge pull request #839 from pengx17:2.4_ocl_csbp
2013-05-14 15:56:07 +04:00
ac21cabda2
Copy ocl::queryDeviceInfo interface from master to 2.4.
...
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.
2013-05-14 17:50:38 +08:00
fd83f2f5ca
Merge pull request #819 from bitwangyaoyao:2.4_haarBuf
2013-05-13 22:36:10 +04:00
355bc691fc
Add OpenCL version 1.2 query into ocl::Context::supportsFeature().
...
Add backwards portability for OpenCL 1.1 when OpenCV executables
are compiled with OpenCL 1.2 profile support.
2013-05-02 14:44:59 +08:00
7b08d5ec69
Add OpenCL stereo CSBP implementation
2013-04-20 00:34:37 +08:00
69a0b5dde5
Add OclCascadeClassifierBuf interface
2013-04-15 17:24:30 +08:00
9ba25e9d09
Merge pull request #742 from bitwangyaoyao:2.4_fix
2013-04-11 11:33:45 +04:00
5022bc8c25
move the "cpu device checking" from supportsFeatures() to queryDeviceInfo()
2013-04-05 09:17:14 +08:00
7758322fd3
Fix some build errors.
2013-04-03 16:42:44 +08:00
ecea583afd
Add ocl::stereobp function.
...
OpenCL StereoBeliefPropagation, ported from GPU implementation.
2013-04-03 15:57:26 +08:00
fd4a6f0af0
make the sparse method give correct results on CPU ocl
...
Add CL_CPU to supportsFeature check
simplify the logic of pyrlk
2013-04-03 13:23:04 +08:00
f3254b28f2
use clflush replaces clfinish
2013-04-02 14:41:02 +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
4bd721ad3b
Fix build errors
2013-03-21 18:37:34 +04:00
7b8ad4cb04
Refactor OpenCL initialization and allow to use ocl module witout explicit setup
2013-03-21 18:18:15 +04:00
6846f881a2
Move OpenCL SURF to nonfree module
2013-03-21 17:59:35 +04:00
Roman Donchenko