platform/upstream/opencv.git
11 years agoInitialize OpenCL context at the end of getDevice call.
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.

11 years agoMerge pull request #932 from bitwangyaoyao:2.4_fixBFM
Vadim Pisarevsky [Thu, 30 May 2013 08:21:26 +0000 (12:21 +0400)]
Merge pull request #932 from bitwangyaoyao:2.4_fixBFM

11 years agoMerge pull request #918 from bitwangyaoyao:2.4_samples
Vadim Pisarevsky [Thu, 30 May 2013 08:01:40 +0000 (12:01 +0400)]
Merge pull request #918 from bitwangyaoyao:2.4_samples

11 years agoMerge pull request #924 from pengx17:2.4_arithm_fix
Vadim Pisarevsky [Thu, 30 May 2013 08:01:25 +0000 (12:01 +0400)]
Merge pull request #924 from pengx17:2.4_arithm_fix

11 years agoMerge pull request #925 from pengx17:2.4_canny_tmp_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

11 years agoMerge pull request #927 from bitwangyaoyao:2.4_perf
Vadim Pisarevsky [Thu, 30 May 2013 08:00:46 +0000 (12:00 +0400)]
Merge pull request #927 from bitwangyaoyao:2.4_perf

11 years agoMerge pull request #930 from pengx17:2.4_haar_ext
Roman Donchenko [Thu, 30 May 2013 07:57:24 +0000 (11:57 +0400)]
Merge pull request #930 from pengx17:2.4_haar_ext

11 years agoFix brute_force_matcher's hung on some Intel CPU OCL
yao [Thu, 30 May 2013 06:57:15 +0000 (14:57 +0800)]
Fix brute_force_matcher's hung on some Intel CPU OCL

11 years agoAdd non-stump based ocl Haar cascade classifier support.
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.

11 years agoMerge pull request #928 from apavlenko:bugfix_3027
Roman Donchenko [Wed, 29 May 2013 13:10:48 +0000 (17:10 +0400)]
Merge pull request #928 from apavlenko:bugfix_3027

11 years agoMerge pull request #920 from asmorkalov:android_move
Roman Donchenko [Wed, 29 May 2013 12:53:02 +0000 (16:53 +0400)]
Merge pull request #920 from asmorkalov:android_move

11 years agoMerge pull request #910 from pengx17:2.4_oclgfft
Roman Donchenko [Wed, 29 May 2013 11:27:18 +0000 (15:27 +0400)]
Merge pull request #910 from pengx17:2.4_oclgfft

11 years agoMerge branch '2.4' of https://github.com/Itseez/opencv into 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

11 years agofixing #3027 (searching JNI even if no ant), fixing java tests status message (ON...
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)

11 years agoadjust test cases
yao [Wed, 29 May 2013 07:48:56 +0000 (15:48 +0800)]
adjust test cases

11 years agoFix 2.4 ocl Canny.
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.

11 years agoMerge pull request #913 from janm399:2.4
Vadim Pisarevsky [Tue, 28 May 2013 18:05:14 +0000 (22:05 +0400)]
Merge pull request #913 from janm399:2.4

11 years agoMerge pull request #916 from bitwangyaoyao:2.4_fixPyrLK
Vadim Pisarevsky [Tue, 28 May 2013 18:04:37 +0000 (22:04 +0400)]
Merge pull request #916 from bitwangyaoyao:2.4_fixPyrLK

11 years agoMerge pull request #919 from abidrahmank:2.4
Vadim Pisarevsky [Tue, 28 May 2013 17:54:51 +0000 (21:54 +0400)]
Merge pull request #919 from abidrahmank:2.4

11 years agoMerge pull request #923 from pengx17:2.4_macfix
Vadim Pisarevsky [Tue, 28 May 2013 17:54:24 +0000 (21:54 +0400)]
Merge pull request #923 from pengx17:2.4_macfix

11 years agofix memory leak
yao [Tue, 28 May 2013 10:07:41 +0000 (18:07 +0800)]
fix memory leak

11 years agorevise perf
yao [Tue, 28 May 2013 09:53:06 +0000 (17:53 +0800)]
revise perf

11 years agoFix a bug when pushing pointers of arguments into std::vector.
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.

11 years agoBuild fixes. Build scrips reorganized.
Alexander Smorkalov [Wed, 22 May 2013 14:09:24 +0000 (18:09 +0400)]
Build fixes. Build scrips reorganized.

11 years agoFix some OpenCL kernel file build errors on Mac.
peng xiao [Tue, 28 May 2013 03:12:05 +0000 (11:12 +0800)]
Fix some OpenCL kernel file build errors on Mac.

11 years agoandroid -> plarforms/android
Alexander Smorkalov [Fri, 17 May 2013 13:15:20 +0000 (17:15 +0400)]
android -> plarforms/android

11 years agoANDed waitkey result with 0xFF for x64 systems
abidrahmank [Mon, 27 May 2013 05:00:30 +0000 (10:30 +0530)]
ANDed waitkey result with 0xFF for x64 systems

11 years agoBug #2960 : docs about CV_BGR2GRAY
abidrahmank [Fri, 24 May 2013 20:20:41 +0000 (01:50 +0530)]
Bug #2960 : docs about CV_BGR2GRAY

11 years agoA new python sample on grabcut
abidrahmank [Fri, 24 May 2013 19:25:31 +0000 (00:55 +0530)]
A new python sample on grabcut

11 years agoadd results verification to facedetect and hog samples
yao [Fri, 24 May 2013 07:52:33 +0000 (15:52 +0800)]
add results verification to facedetect and hog samples

11 years agofix hog
yao [Fri, 24 May 2013 05:46:21 +0000 (13:46 +0800)]
fix hog

11 years agoremove the images in ocl sample folder
yao [Thu, 23 May 2013 10:12:09 +0000 (18:12 +0800)]
remove the images in ocl sample folder

11 years agoadd two samples
yao [Thu, 23 May 2013 10:10:38 +0000 (18:10 +0800)]
add two samples

11 years agofix Linux build errors
yao [Thu, 23 May 2013 09:58:50 +0000 (17:58 +0800)]
fix Linux build errors

11 years agofix pyrLK's mismatch on Intel GPUs
yao [Thu, 23 May 2013 02:55:08 +0000 (10:55 +0800)]
fix pyrLK's mismatch on Intel GPUs

11 years agoMerge pull request #904 from ograycode:2.4
Roman Donchenko [Wed, 22 May 2013 14:46:39 +0000 (18:46 +0400)]
Merge pull request #904 from ograycode:2.4

11 years agoFixed include name in OpenCL on OS X
Jan Machacek [Wed, 22 May 2013 12:22:16 +0000 (13:22 +0100)]
Fixed include name in OpenCL on OS X

11 years agoMerge pull request #905 from bitwangyaoyao:2.4_TVL1
Roman Donchenko [Wed, 22 May 2013 08:08:16 +0000 (12:08 +0400)]
Merge pull request #905 from bitwangyaoyao:2.4_TVL1

11 years agoAdd ocl's good features to track implementation.
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.

11 years agoMerge pull request #902 from apavlenko:fix_run_py
Andrey Pavlenko [Tue, 21 May 2013 10:07:31 +0000 (14:07 +0400)]
Merge pull request #902 from apavlenko:fix_run_py

11 years agoMerge pull request #882 from pengx17:2.4_rewrite_query_info
Vadim Pisarevsky [Mon, 20 May 2013 10:01:03 +0000 (14:01 +0400)]
Merge pull request #882 from pengx17:2.4_rewrite_query_info

11 years agoMerge pull request #895 from bitwangyaoyao:2.4_perf
Vadim Pisarevsky [Mon, 20 May 2013 10:00:46 +0000 (14:00 +0400)]
Merge pull request #895 from bitwangyaoyao:2.4_perf

11 years agoMerge pull request #853 from icylord:2.4
Roman Donchenko [Mon, 20 May 2013 08:11:47 +0000 (12:11 +0400)]
Merge pull request #853 from icylord:2.4

11 years agoFix the mismatch on NV GPUs
yao [Mon, 20 May 2013 06:46:17 +0000 (14:46 +0800)]
Fix the mismatch on NV GPUs

11 years agoSimple set of the camera index to allow the user to change it after the object has...
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.

11 years ago'aapt' tool moved in SDK r22, adding support to run.py
Andrey Pavlenko [Sun, 19 May 2013 10:57:21 +0000 (14:57 +0400)]
'aapt' tool moved in SDK r22, adding support to run.py

11 years agoMerge pull request #897 from bitwangyaoyao:2.4_TVL1
Vadim Pisarevsky [Sat, 18 May 2013 20:23:23 +0000 (00:23 +0400)]
Merge pull request #897 from bitwangyaoyao:2.4_TVL1

11 years agofix a warning
yao [Fri, 17 May 2013 07:44:22 +0000 (15:44 +0800)]
fix a warning

11 years agoadd OpticalFlowDual_TVL1_OCL function
yao [Fri, 17 May 2013 07:34:22 +0000 (15:34 +0800)]
add OpticalFlowDual_TVL1_OCL function

11 years agofix the waring in gemm test
yao [Fri, 17 May 2013 05:19:09 +0000 (13:19 +0800)]
fix the waring in gemm test

11 years agoadd accuracy tests while running perf
yao [Fri, 17 May 2013 05:18:46 +0000 (13:18 +0800)]
add accuracy tests while running perf

11 years agoMerge pull request #892 from jet47:removed-vibe
Andrey Pavlenko [Thu, 16 May 2013 14:44:06 +0000 (18:44 +0400)]
Merge pull request #892 from jet47:removed-vibe

11 years agoremoved VIBE implementation
Vladislav Vinogradov [Thu, 16 May 2013 09:47:24 +0000 (13:47 +0400)]
removed VIBE implementation

11 years agoMerge pull request #885 from pengx17:2.4_bfmatcher_ocl
Vadim Pisarevsky [Wed, 15 May 2013 10:21:49 +0000 (14:21 +0400)]
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl

11 years agoMerge pull request #884 from pengx17:2.4_pyrup_fix
Vadim Pisarevsky [Wed, 15 May 2013 10:18:53 +0000 (14:18 +0400)]
Merge pull request #884 from pengx17:2.4_pyrup_fix

11 years agoAdd BFMatcher_OCL class alias for BruteForceMatcher_OCL.
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.

11 years agoClean up spaces in ocl.hpp
peng xiao [Wed, 15 May 2013 02:43:47 +0000 (10:43 +0800)]
Clean up spaces in ocl.hpp

11 years agoMerge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
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

11 years agoFix ocl::pyrUp
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

11 years agoMerge pull request #862 from piponazo:v4lFPS
Vadim Pisarevsky [Tue, 14 May 2013 12:00:28 +0000 (16:00 +0400)]
Merge pull request #862 from piponazo:v4lFPS

11 years agoMerge pull request #818 from bitwangyaoyao:2.4_optBlur
Vadim Pisarevsky [Tue, 14 May 2013 11:56:55 +0000 (15:56 +0400)]
Merge pull request #818 from bitwangyaoyao:2.4_optBlur

11 years agoMerge pull request #839 from pengx17:2.4_ocl_csbp
Vadim Pisarevsky [Tue, 14 May 2013 11:56:06 +0000 (15:56 +0400)]
Merge pull request #839 from pengx17:2.4_ocl_csbp

11 years agoMerge pull request #883 from bitwangyaoyao:2.4_fixMoments
Vadim Pisarevsky [Tue, 14 May 2013 11:55:38 +0000 (15:55 +0400)]
Merge pull request #883 from bitwangyaoyao:2.4_fixMoments

11 years agofix black screen when input Mat is large
yao [Tue, 14 May 2013 10:02:53 +0000 (18:02 +0800)]
fix black screen when input Mat is large

11 years agoCopy ocl::queryDeviceInfo interface from master to 2.4.
peng xiao [Tue, 14 May 2013 09:50:38 +0000 (17:50 +0800)]
Copy ocl::queryDeviceInfo interface from master to 2.4.
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.

11 years agoMerge pull request #878 from apavlenko:better_glue_search
Andrey Pavlenko [Tue, 14 May 2013 07:57:24 +0000 (11:57 +0400)]
Merge pull request #878 from apavlenko:better_glue_search

11 years agoMerge pull request #849 from dominikrose:dom_2.4
Vadim Pisarevsky [Mon, 13 May 2013 19:38:26 +0000 (23:38 +0400)]
Merge pull request #849 from dominikrose:dom_2.4

11 years agoMerge pull request #872 from pengx17:2.4_create2dimage_fix
Vadim Pisarevsky [Mon, 13 May 2013 19:12:25 +0000 (23:12 +0400)]
Merge pull request #872 from pengx17:2.4_create2dimage_fix

11 years agoMerge pull request #871 from bitwangyaoyao:2.4_acry
Vadim Pisarevsky [Mon, 13 May 2013 19:04:11 +0000 (23:04 +0400)]
Merge pull request #871 from bitwangyaoyao:2.4_acry

11 years agoMerge pull request #819 from bitwangyaoyao:2.4_haarBuf
Vadim Pisarevsky [Mon, 13 May 2013 18:36:09 +0000 (22:36 +0400)]
Merge pull request #819 from bitwangyaoyao:2.4_haarBuf

11 years agoMerge pull request #850 from SpecLad:convhull-orientation
Vadim Pisarevsky [Mon, 13 May 2013 18:18:53 +0000 (22:18 +0400)]
Merge pull request #850 from SpecLad:convhull-orientation

11 years agoMerge pull request #880 from apavlenko:qt-5.0
Andrey Pavlenko [Mon, 13 May 2013 17:18:47 +0000 (21:18 +0400)]
Merge pull request #880 from apavlenko:qt-5.0

11 years agoMerge pull request #879 from apavlenko:gcc-4.8
Andrey Pavlenko [Mon, 13 May 2013 17:17:04 +0000 (21:17 +0400)]
Merge pull request #879 from apavlenko:gcc-4.8

11 years agoMerge pull request #873 from prclibo:2.4
Vadim Pisarevsky [Mon, 13 May 2013 17:06:54 +0000 (21:06 +0400)]
Merge pull request #873 from prclibo:2.4

11 years agoUpdate CMake scripts to recognize Qt 5.0
Andrey Kamaev [Wed, 17 Apr 2013 18:02:01 +0000 (22:02 +0400)]
Update CMake scripts to recognize Qt 5.0

11 years agoFix build warnings from gcc 4.8
Andrey Kamaev [Wed, 17 Apr 2013 18:01:03 +0000 (22:01 +0400)]
Fix build warnings from gcc 4.8

11 years agoImprove handling of native_app_glue dependency in Android samples
Andrey Kamaev [Wed, 17 Apr 2013 12:55:05 +0000 (16:55 +0400)]
Improve handling of native_app_glue dependency in Android samples

11 years agofix the warnings in fft tests
yao [Mon, 13 May 2013 07:04:23 +0000 (15:04 +0800)]
fix the warnings in fft tests

11 years agoMerge pull request #864 from pengx17:2.4_stereobm
Vadim Pisarevsky [Sun, 12 May 2013 18:16:03 +0000 (22:16 +0400)]
Merge pull request #864 from pengx17:2.4_stereobm

11 years agoMerge pull request #877 from apavlenko:version_info_in_test_log
Vadim Pisarevsky [Sun, 12 May 2013 18:15:47 +0000 (22:15 +0400)]
Merge pull request #877 from apavlenko:version_info_in_test_log

11 years agoadding version info to test log
Andrey Pavlenko [Sun, 12 May 2013 14:36:55 +0000 (18:36 +0400)]
adding version info to test log

11 years agofix warnings, unify test names
yao [Thu, 9 May 2013 09:57:13 +0000 (17:57 +0800)]
fix warnings, unify test names

11 years agofixed pca bug for fixed mean input
Bo Li [Thu, 9 May 2013 07:20:00 +0000 (15:20 +0800)]
fixed pca bug for fixed mean input

11 years agoFix ocl moudle build with latest Intel OpenCL SDK.
peng xiao [Thu, 9 May 2013 06:00:36 +0000 (14:00 +0800)]
Fix ocl moudle build with latest Intel OpenCL SDK.
We found that cl.h file provided in latest Intel SDK muted deprecated interfaces.

11 years agoOptimize stereobm a bit.
peng xiao [Wed, 8 May 2013 09:29:24 +0000 (17:29 +0800)]
Optimize stereobm a bit.
Speedup about 30% on 6730M GPU.

11 years agouse clean EXPECT_MAT_NEAR (no string output)
yao [Wed, 8 May 2013 09:07:44 +0000 (17:07 +0800)]
use clean EXPECT_MAT_NEAR (no string output)

11 years agofurther simplify the logics in filter tests
yao [Wed, 8 May 2013 08:08:33 +0000 (16:08 +0800)]
further simplify the logics in filter tests

11 years agoremove interpolation.hpp
yao [Wed, 8 May 2013 07:27:35 +0000 (15:27 +0800)]
remove interpolation.hpp

11 years agoadd copyrights
yao [Wed, 8 May 2013 07:21:53 +0000 (15:21 +0800)]
add copyrights

11 years agosimplify logics in filter tests, remove redundant code in arithm tests
yao [Wed, 8 May 2013 07:12:12 +0000 (15:12 +0800)]
simplify logics in filter tests, remove redundant code in arithm tests

11 years agoMerge pull request #866 from MadEgg:RetrieveFrame_index_argument
Andrey Pavlenko [Tue, 7 May 2013 13:00:29 +0000 (17:00 +0400)]
Merge pull request #866 from MadEgg:RetrieveFrame_index_argument

11 years agoMerge pull request #865 from pengx17:2.4_ocl_ver
Vadim Pisarevsky [Tue, 7 May 2013 12:39:49 +0000 (16:39 +0400)]
Merge pull request #865 from pengx17:2.4_ocl_ver

11 years agoMerge pull request #846 from smart-mobile-software:tuto_crash
Andrey Pavlenko [Tue, 7 May 2013 11:15:16 +0000 (15:15 +0400)]
Merge pull request #846 from smart-mobile-software:tuto_crash

11 years agoLink to bug tracker replaced by bug description
poiuytrez [Tue, 7 May 2013 09:45:18 +0000 (11:45 +0200)]
Link to bug tracker replaced by bug description

11 years agosome cleanup, remove some commented codes
yao [Tue, 7 May 2013 08:14:50 +0000 (16:14 +0800)]
some cleanup, remove some commented codes

11 years agoSuppress warning when compiling deprecated OpenCL function on GNU compilers.
peng xiao [Mon, 6 May 2013 09:16:45 +0000 (17:16 +0800)]
Suppress warning when compiling deprecated OpenCL function on GNU compilers.

11 years ago add (optional) index argument to RetrieveFrame method
Egbert van der Wal [Sat, 4 May 2013 15:17:12 +0000 (17:17 +0200)]
 add (optional) index argument to RetrieveFrame method

11 years agoFix build
peng xiao [Fri, 3 May 2013 01:54:11 +0000 (09:54 +0800)]
Fix build

11 years agoocl: Enable backward binary portability for setTo function.
peng xiao [Fri, 3 May 2013 01:45:56 +0000 (09:45 +0800)]
ocl: Enable backward binary portability for setTo function.

11 years agoOptimize ocl::stereobm.
peng xiao [Thu, 2 May 2013 08:14:28 +0000 (16:14 +0800)]
Optimize ocl::stereobm.
1. Use macro defines for some parameters(radius).
2. Reduce local memory usage.
3. Fix accuracy problem on Intel GPU.