Roman Donchenko [Wed, 5 Jun 2013 09:51:11 +0000 (13:51 +0400)]
Fix typo in .gitattributes.
Roman Donchenko [Wed, 5 Jun 2013 07:50:11 +0000 (11:50 +0400)]
Merge pull request #947 from jet47:fix-gpu-arm-build
Roman Donchenko [Wed, 5 Jun 2013 07:27:08 +0000 (11:27 +0400)]
Merge pull request #941 from apavlenko:signed_char
Roman Donchenko [Tue, 4 Jun 2013 13:52:30 +0000 (17:52 +0400)]
Merge pull request #893 from jet47:gpu-arm-fixes
Roman Donchenko [Tue, 4 Jun 2013 13:50:31 +0000 (17:50 +0400)]
Merge pull request #940 from SpecLad:autolock
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:53 +0000 (13:34 +0400)]
Merge pull request #933 from pengx17:2.4_macfix_cont
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:39 +0000 (13:34 +0400)]
Merge pull request #935 from pengx17:2.4_filter2d_fix
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:25 +0000 (13:34 +0400)]
Merge pull request #936 from bitwangyaoyao:2.4_perf
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:09 +0000 (13:34 +0400)]
Merge pull request #937 from bitwangyaoyao:2.4_fixPyrLK
Vadim Pisarevsky [Tue, 4 Jun 2013 09:33:48 +0000 (13:33 +0400)]
Merge pull request #938 from pengx17:2.4_surf_sample
Vadim Pisarevsky [Tue, 4 Jun 2013 09:33:21 +0000 (13:33 +0400)]
Merge pull request #939 from pengx17:2.4_getDevice
Vladislav Vinogradov [Tue, 4 Jun 2013 08:51:36 +0000 (12:51 +0400)]
fixed gpu module build on arm platform
links with CUDA driver library only if we use video encoding/decoding
peng xiao [Tue, 4 Jun 2013 07:55:33 +0000 (15:55 +0800)]
Fix a bug of gfft.
When user provided corners buffer is big enough to be copied to from
tmpCorners_, we allow the buffer to be reused other than allocate a new
cl_mem object.
yao [Tue, 4 Jun 2013 03:31:54 +0000 (11:31 +0800)]
change a test image of pyrlk
Roman Donchenko [Mon, 3 Jun 2013 12:08:23 +0000 (16:08 +0400)]
Merge pull request #943 from jet47:cuda-5.5-support
Roman Donchenko [Mon, 3 Jun 2013 12:08:06 +0000 (16:08 +0400)]
Merge pull request #944 from jet47:cmake-2.8.11-cuda-fix
Vladislav Vinogradov [Mon, 3 Jun 2013 10:41:23 +0000 (14:41 +0400)]
fixed constructors for functional objects (added __host__ modifier)
Vladislav Vinogradov [Mon, 3 Jun 2013 10:01:04 +0000 (14:01 +0400)]
disabled samples with driver api
Vladislav Vinogradov [Mon, 3 Jun 2013 09:36:02 +0000 (13:36 +0400)]
fixed norm diff function (it uses pre-allocated buffer now)
Vladislav Vinogradov [Mon, 3 Jun 2013 09:34:41 +0000 (13:34 +0400)]
fixed NPP error constants usage
Vladislav Vinogradov [Mon, 3 Jun 2013 09:33:53 +0000 (13:33 +0400)]
fixed NPP library search (it was splitted)
Vladislav Vinogradov [Mon, 3 Jun 2013 09:24:57 +0000 (13:24 +0400)]
fixed GPU module compialtion with CMake 2.8.11
CMake 2.8.11 removed linkage with CUDA driver library,
but it's used by gpu video encoding/decoding
Roman Donchenko [Mon, 3 Jun 2013 08:13:44 +0000 (12:13 +0400)]
Merge pull request #912 from SpecLad:contributing
Roman Donchenko [Mon, 3 Jun 2013 08:13:15 +0000 (12:13 +0400)]
Merge pull request #934 from SpecLad:parallel-for
Andrey Pavlenko [Fri, 31 May 2013 15:55:51 +0000 (19:55 +0400)]
making the comment less ambigous
Andrey Pavlenko [Fri, 31 May 2013 14:58:30 +0000 (18:58 +0400)]
setting 'char' to be signed by default since some tests fail when it's wrong (e.g. native compilation on ARM Linux)
Roman Donchenko [Fri, 31 May 2013 13:27:42 +0000 (17:27 +0400)]
Make AutoLock noncopyable (it would break on copying, anyway).
Roman Donchenko [Fri, 31 May 2013 12:46:30 +0000 (16:46 +0400)]
Merge pull request #931 from jet47:gpu-test-fixes
peng xiao [Fri, 31 May 2013 09:29:55 +0000 (17:29 +0800)]
Fix build error
peng xiao [Fri, 31 May 2013 08:48:40 +0000 (16:48 +0800)]
Initialize OpenCL context at the end of getDevice call.
Added for better compatibility with the current samples/test cases.
User now will be able to initialize OpenCL context explicitly with
ocl::getDevice api.
This may be obsoleted in future releases.
Roman Donchenko [Thu, 30 May 2013 15:05:59 +0000 (19:05 +0400)]
Split CLAHE into its own file, because it's faster that way.
Yes, it's as ludicrous as it sounds, but it's still true. Bizarrely,
the previous commit makes CLAHE run about 10% slower on Android, even
though it doesn't even touch any CLAHE code. Splitting it off fixes that,
although the reason it does is a mystery for the ages.
It's cleaner when it's in its own file, anyway. ;=]
Roman Donchenko [Thu, 30 May 2013 14:44:33 +0000 (18:44 +0400)]
Replaced most of the usages of parallel_for with that of parallel_for_.
This should allow many algorithms to take advantage of more parallelization
technologies.
peng xiao [Fri, 31 May 2013 08:06:56 +0000 (16:06 +0800)]
Update ocl::surf_matcher sample.
The new sample adjust some parameters thus it should always be able to
calculate valid homography matrix when input is box.png and
box_in_scene.png.
Pure cpp surf and bfmatcher implementation is also added to show the user
its accuracy and performance.
yao [Fri, 31 May 2013 07:35:54 +0000 (15:35 +0800)]
fix a crash on Linux
yao [Fri, 31 May 2013 07:16:03 +0000 (15:16 +0800)]
Adjust perf_filters, as this function only supports 3x3 kernel
peng xiao [Fri, 31 May 2013 02:53:52 +0000 (10:53 +0800)]
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.
peng xiao [Thu, 30 May 2013 01:37:05 +0000 (09:37 +0800)]
Fix ocl::pyrup kernel build on Mac.
Vadim Pisarevsky [Thu, 30 May 2013 08:21:26 +0000 (12:21 +0400)]
Merge pull request #932 from bitwangyaoyao:2.4_fixBFM
yao [Thu, 30 May 2013 08:20:31 +0000 (16:20 +0800)]
a few fixes of ocl::perf test cases
Vadim Pisarevsky [Thu, 30 May 2013 08:01:40 +0000 (12:01 +0400)]
Merge pull request #918 from bitwangyaoyao:2.4_samples
Vadim Pisarevsky [Thu, 30 May 2013 08:01:25 +0000 (12:01 +0400)]
Merge pull request #924 from pengx17:2.4_arithm_fix
Vadim Pisarevsky [Thu, 30 May 2013 08:01:08 +0000 (12:01 +0400)]
Merge pull request #925 from pengx17:2.4_canny_tmp_fix
Vadim Pisarevsky [Thu, 30 May 2013 08:00:46 +0000 (12:00 +0400)]
Merge pull request #927 from bitwangyaoyao:2.4_perf
Roman Donchenko [Thu, 30 May 2013 07:57:24 +0000 (11:57 +0400)]
Merge pull request #930 from pengx17:2.4_haar_ext
yao [Thu, 30 May 2013 06:57:15 +0000 (14:57 +0800)]
Fix brute_force_matcher's hung on some Intel CPU OCL
peng xiao [Thu, 30 May 2013 06:01:19 +0000 (14:01 +0800)]
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.
Vladislav Vinogradov [Wed, 29 May 2013 13:38:32 +0000 (17:38 +0400)]
fixed some gpu tests (different rounding results due to float arithmetics)
Roman Donchenko [Wed, 29 May 2013 13:10:48 +0000 (17:10 +0400)]
Merge pull request #928 from apavlenko:bugfix_3027
Roman Donchenko [Wed, 29 May 2013 12:53:02 +0000 (16:53 +0400)]
Merge pull request #920 from asmorkalov:android_move
Roman Donchenko [Wed, 29 May 2013 11:27:18 +0000 (15:27 +0400)]
Merge pull request #910 from pengx17:2.4_oclgfft
peng xiao [Wed, 29 May 2013 09:57:14 +0000 (17:57 +0800)]
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft
Andrey Pavlenko [Wed, 29 May 2013 08:51:26 +0000 (12:51 +0400)]
fixing #3027 (searching JNI even if no ant), fixing java tests status message (ON/OFF)
yao [Wed, 29 May 2013 07:48:56 +0000 (15:48 +0800)]
adjust test cases
peng xiao [Wed, 29 May 2013 06:15:26 +0000 (14:15 +0800)]
Fix 2.4 ocl Canny.
This fix is a workaround for current 2.4 branch without introducing an
additional oclMat buffer into CannyBuf object.
Test case is cleaned up.
Volatile keywords in kernels are removed for performance concern.
Vadim Pisarevsky [Tue, 28 May 2013 18:05:14 +0000 (22:05 +0400)]
Merge pull request #913 from janm399:2.4
Vadim Pisarevsky [Tue, 28 May 2013 18:04:37 +0000 (22:04 +0400)]
Merge pull request #916 from bitwangyaoyao:2.4_fixPyrLK
Vadim Pisarevsky [Tue, 28 May 2013 17:54:51 +0000 (21:54 +0400)]
Merge pull request #919 from abidrahmank:2.4
Vadim Pisarevsky [Tue, 28 May 2013 17:54:24 +0000 (21:54 +0400)]
Merge pull request #923 from pengx17:2.4_macfix
yao [Tue, 28 May 2013 10:07:41 +0000 (18:07 +0800)]
fix memory leak
yao [Tue, 28 May 2013 09:53:06 +0000 (17:53 +0800)]
revise perf
peng xiao [Tue, 28 May 2013 09:27:55 +0000 (17:27 +0800)]
Fix a bug when pushing pointers of arguments into std::vector.
When argument pointers pushed into an vector and the pointers point to
address on stack, we need to make sure they are valid until kernels are
successfully flushed onto the queue.
Alexander Smorkalov [Wed, 22 May 2013 14:09:24 +0000 (18:09 +0400)]
Build fixes. Build scrips reorganized.
peng xiao [Tue, 28 May 2013 03:12:05 +0000 (11:12 +0800)]
Fix some OpenCL kernel file build errors on Mac.
Roman Donchenko [Wed, 22 May 2013 11:14:38 +0000 (15:14 +0400)]
Replace the pull request guidelines with a link to the wiki.
I've moved the contents of CONTRIBUTING.md to the wiki (and slightly
expanded it), so the former is no longer required. I've put a link to the
wiki page and a summary in the README.
Alexander Smorkalov [Fri, 17 May 2013 13:15:20 +0000 (17:15 +0400)]
android -> plarforms/android
abidrahmank [Mon, 27 May 2013 05:00:30 +0000 (10:30 +0530)]
ANDed waitkey result with 0xFF for x64 systems
abidrahmank [Fri, 24 May 2013 20:20:41 +0000 (01:50 +0530)]
Bug #2960 : docs about CV_BGR2GRAY
abidrahmank [Fri, 24 May 2013 19:25:31 +0000 (00:55 +0530)]
A new python sample on grabcut
yao [Fri, 24 May 2013 07:52:33 +0000 (15:52 +0800)]
add results verification to facedetect and hog samples
yao [Fri, 24 May 2013 05:46:21 +0000 (13:46 +0800)]
fix hog
yao [Thu, 23 May 2013 10:12:09 +0000 (18:12 +0800)]
remove the images in ocl sample folder
yao [Thu, 23 May 2013 10:10:38 +0000 (18:10 +0800)]
add two samples
yao [Thu, 23 May 2013 09:58:50 +0000 (17:58 +0800)]
fix Linux build errors
yao [Thu, 23 May 2013 02:55:08 +0000 (10:55 +0800)]
fix pyrLK's mismatch on Intel GPUs
Roman Donchenko [Wed, 22 May 2013 14:46:39 +0000 (18:46 +0400)]
Merge pull request #904 from ograycode:2.4
Jan Machacek [Wed, 22 May 2013 12:22:16 +0000 (13:22 +0100)]
Fixed include name in OpenCL on OS X
Roman Donchenko [Wed, 22 May 2013 08:08:16 +0000 (12:08 +0400)]
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
peng xiao [Wed, 22 May 2013 05:46:42 +0000 (13:46 +0800)]
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.
Andrey Pavlenko [Tue, 21 May 2013 10:07:31 +0000 (14:07 +0400)]
Merge pull request #902 from apavlenko:fix_run_py
Vadim Pisarevsky [Mon, 20 May 2013 10:01:03 +0000 (14:01 +0400)]
Merge pull request #882 from pengx17:2.4_rewrite_query_info
Vadim Pisarevsky [Mon, 20 May 2013 10:00:46 +0000 (14:00 +0400)]
Merge pull request #895 from bitwangyaoyao:2.4_perf
Roman Donchenko [Mon, 20 May 2013 08:11:47 +0000 (12:11 +0400)]
Merge pull request #853 from icylord:2.4
yao [Mon, 20 May 2013 06:46:17 +0000 (14:46 +0800)]
Fix the mismatch on NV GPUs
ograycode [Mon, 20 May 2013 02:04:56 +0000 (22:04 -0400)]
Simple set of the camera index to allow the user to change it after the object has been initialized.
Andrey Pavlenko [Sun, 19 May 2013 10:57:21 +0000 (14:57 +0400)]
'aapt' tool moved in SDK r22, adding support to run.py
Vadim Pisarevsky [Sat, 18 May 2013 20:23:23 +0000 (00:23 +0400)]
Merge pull request #897 from bitwangyaoyao:2.4_TVL1
yao [Fri, 17 May 2013 07:44:22 +0000 (15:44 +0800)]
fix a warning
yao [Fri, 17 May 2013 07:34:22 +0000 (15:34 +0800)]
add OpticalFlowDual_TVL1_OCL function
yao [Fri, 17 May 2013 05:19:09 +0000 (13:19 +0800)]
fix the waring in gemm test
yao [Fri, 17 May 2013 05:18:46 +0000 (13:18 +0800)]
add accuracy tests while running perf
Andrey Pavlenko [Thu, 16 May 2013 14:44:06 +0000 (18:44 +0400)]
Merge pull request #892 from jet47:removed-vibe
Vladislav Vinogradov [Thu, 16 May 2013 09:47:24 +0000 (13:47 +0400)]
removed VIBE implementation
Vadim Pisarevsky [Wed, 15 May 2013 10:21:49 +0000 (14:21 +0400)]
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
Vadim Pisarevsky [Wed, 15 May 2013 10:18:53 +0000 (14:18 +0400)]
Merge pull request #884 from pengx17:2.4_pyrup_fix
peng xiao [Wed, 15 May 2013 02:47:17 +0000 (10:47 +0800)]
Add BFMatcher_OCL class alias for BruteForceMatcher_OCL.
This adds a similar interface with pure-cpp and gpu versions.
peng xiao [Wed, 15 May 2013 02:43:47 +0000 (10:43 +0800)]
Clean up spaces in ocl.hpp
peng xiao [Wed, 15 May 2013 00:55:43 +0000 (08:55 +0800)]
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
peng xiao [Wed, 15 May 2013 00:51:21 +0000 (08:51 +0800)]
Fix ocl::pyrUp
Use predefined OpenCL function to convert integers to floating points.
This is more accurate than before as it enables:
1. saturate cast
2. customized rounding
Vadim Pisarevsky [Tue, 14 May 2013 12:00:28 +0000 (16:00 +0400)]
Merge pull request #862 from piponazo:v4lFPS
Vadim Pisarevsky [Tue, 14 May 2013 11:56:55 +0000 (15:56 +0400)]
Merge pull request #818 from bitwangyaoyao:2.4_optBlur