yao
7726e273a9
merge add and sub into one set of kernels
2013-04-06 13:37:36 +08:00
yao
bee970ab94
remove the C3 kernels in arithm, as the oclMat will never store 3 channels data
2013-04-05 21:29:29 +08:00
Andrey Kamaev
72e49dc790
Merge pull request #777 from taka-no-me:ocl_win_hang
2013-04-05 13:00:03 +04:00
Andrey Kamaev
a2d27429e4
Merge pull request #775 from bitwangyaoyao:2.4_fixerr
2013-04-05 12:59:45 +04:00
Andrey Kamaev
977562b614
Merge pull request #771 from gpsinghsandhu:surfFeatureFinder
2013-04-05 12:59:22 +04:00
Andrey Kamaev
3b6a82b57c
Merge pull request #769 from apavlenko:fix_2901
2013-04-05 12:59:02 +04:00
Andrey Kamaev
3400d83778
Workaround hanging of ocl module when ocl API in not really used
2013-04-05 11:01:28 +04:00
Andrey Pavlenko
4c31c26acf
fix for #2901 (en exception was raised when getting empty MatOfDMatch)
2013-04-05 08:50:37 +04:00
Andrey Pavlenko
09fe5cddf1
test for the issue #2901
2013-04-05 08:50:24 +04:00
Andrey Pavlenko
18b2d6bdbb
copying '.classpath' and '.project' to build dir, useful for opening in eclipse
2013-04-05 08:50:08 +04:00
Dustin Spicuzza
64b5784c0b
Catch exceptions when large allocations fail
2013-04-05 00:43:10 -04:00
yao
8cc5b98051
Fix the problem of device selection on hybrid video systems.
2013-04-05 09:19:59 +08:00
yao
5022bc8c25
move the "cpu device checking" from supportsFeatures() to queryDeviceInfo()
2013-04-05 09:17:14 +08:00
yao
bcc086baa9
fix all redefine build errors on some Intel OCL
2013-04-05 08:15:05 +08:00
Gurpinder Singh Sandhu
69127e4105
some typo
2013-04-04 22:54:27 +05:30
Gurpinder Singh Sandhu
2b1e13f8f4
changed surfFeaturesFinder::find() to allow CV_8UC1 type images
...
http://code.opencv.org/issues/2926
2013-04-04 22:52:07 +05:30
Andrey Kamaev
652606f780
Merge pull request #770 from asmorkalov:winrt
2013-04-04 20:01:55 +04:00
Andrey Kamaev
80fed87d53
Merge pull request #760 from alekcac:2.4
2013-04-04 18:44:35 +04:00
Alexander Smorkalov
a914088f29
Build warning fixes.
2013-04-04 07:29:53 -07:00
Andrey Kamaev
6570215205
Merge pull request #767 from asmorkalov:version_increment
2013-04-04 18:00:44 +04:00
Andrey Kamaev
1d7ff721ed
Merge pull request #764 from taka-no-me:svd
2013-04-04 17:59:57 +04:00
Andrey Kamaev
579f723fc6
Merge pull request #762 from vpisarev:cvt_fix
2013-04-04 17:59:28 +04:00
Andrey Kamaev
7c402d1e15
Merge pull request #759 from asmorkalov:android_common_fixes
2013-04-04 17:58:44 +04:00
Andrey Kamaev
6f288615a2
Merge pull request #756 from taka-no-me:libavcodec53.25.0
2013-04-04 17:57:17 +04:00
Andrey Kamaev
e22983ddb6
Merge pull request #753 from taka-no-me:fix_osx_fat_java
2013-04-04 17:55:28 +04:00
Alexander Smorkalov
1e332d690f
OpenCV verison incremented
...
OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.
2013-04-04 15:50:36 +04:00
Vadim Pisarevsky
6aa4f533fa
attempt to fix stereobm failures on Mac and Linux
2013-04-04 14:27:11 +04:00
Andrey Kamaev
235a678458
SVD: always update W vector for better algorithm convergency
2013-04-04 13:55:36 +04:00
Alexander Shishkov
382695ba5a
removed links to the http://opencv.willowgarage.com/
2013-04-04 13:44:28 +04:00
Alexander Smorkalov
36367ec027
Several fixes android related fixes
...
Native activity build warning fixed;
Logcat messages for JavaCameraView updated (Bug #2876 );
Some fixes for feature #2893 done.
2013-04-04 12:18:13 +04:00
Andrey Kamaev
eb3c9ed1ab
Fix ffmpeg wrapper compatibility with libavcodec > 53.25.0
...
Based on pull request #685
2013-04-04 11:27:43 +04:00
Andrey Kamaev
1e9ed14205
Merge pull request #752 from khzimmer:2.4
2013-04-04 00:57:33 +04:00
Andrey Kamaev
0e53c56cf6
Merge pull request #744 from pengx17:Branch_2.4_stereobp_ocl
2013-04-04 00:55:03 +04:00
Andrey Kamaev
eeaa1e8751
Fix link of fat java wrapper on OS X
2013-04-03 20:02:13 +04:00
Karl-Heinz Zimmer
2122627877
Set ptr to NULL, so this method can be called repeatedly. This fixes a crash after unplugging web cam and trying to re-scan the cameras.
2013-04-03 17:54:29 +02:00
Andrey Kamaev
91f6eb7cab
Merge pull request #745 from jet47:fix-gpu-warnings
2013-04-03 15:44:46 +04:00
Andrey Kamaev
795a513ac4
Merge pull request #716 from asmorkalov:winrt
2013-04-03 15:39:58 +04:00
Andrey Kamaev
6c58a22e32
Merge pull request #743 from jet47:fix-sparsemat-iterator
2013-04-03 15:18:11 +04:00
Andrey Kamaev
d7a7d05dd6
Merge pull request #738 from jet47:gpu-disable-videoenc-test
2013-04-03 15:17:53 +04:00
Alexander Smorkalov
a2561ee0cd
Code review notes fixed.
2013-04-03 04:14:40 -07:00
Vladislav Vinogradov
870563ba25
fixed compilation warning for CUDA files
...
command line option '-Wsign-promo' is valid for C++/ObjC++ but not for C [enabled by default]
2013-04-03 13:47:59 +04:00
peng xiao
917138f565
Fix compilation errors.
2013-04-03 17:36:05 +08:00
peng xiao
7758322fd3
Fix some build errors.
2013-04-03 16:42:44 +08:00
Vladislav Vinogradov
9d7e51eb46
fixed SparseMat Iterator compilation error (bug #2921 )
2013-04-03 12:39:03 +04:00
peng xiao
ecea583afd
Add ocl::stereobp function.
...
OpenCL StereoBeliefPropagation, ported from GPU implementation.
2013-04-03 15:57:26 +08:00
yao
d5aaea2749
fix some mismatch on cpu device running OCL
2013-04-03 14:24:55 +08:00
yao
cb63bbf001
fix hog on some CPU device running ocl
2013-04-03 13:58:44 +08:00
yao
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
Alexander Smorkalov
4703f4552a
Experimental MS Media Foundation API support added
2013-04-02 18:10:55 -07:00
dave
8db1a73102
Added v4l2 support for getting capture property CV_CAP_PROP_POS_MSEC
2013-04-02 10:31:02 -07:00
Vladislav Vinogradov
8d521d4704
disabled perf tests for gpu VideoWriter and VideoReader
2013-04-02 16:49:09 +04:00
Andrey Kamaev
656594ad4f
Merge pull request #736 from bitwangyaoyao:2.4_clflush
2013-04-02 15:25:19 +04:00
Andrey Kamaev
baa4882a2a
Merge pull request #735 from jet47:fix-windows-issues
2013-04-02 15:25:06 +04:00
Andrey Kamaev
f9f1261469
Merge pull request #734 from apavlenko:fix_2806
2013-04-02 15:24:53 +04:00
Andrey Kamaev
74097a426b
Merge pull request #732 from apavlenko:disable_unstable_test
2013-04-02 15:24:40 +04:00
Andrey Kamaev
04f0d31472
Merge pull request #731 from bitwangyaoyao:2.4_fixDft
2013-04-02 15:24:26 +04:00
Andrey Kamaev
727a339455
Merge pull request #730 from vpisarev:ba_fix
2013-04-02 15:24:12 +04:00
Vladislav Vinogradov
642d7d6826
fixed nonfree test (run it only on one gpu device)
2013-04-02 13:24:39 +04:00
Vladislav Vinogradov
9086efa8e9
fixed warnings
2013-04-02 13:24:00 +04:00
Vladislav Vinogradov
b47a2012d2
fixed assert condition (trueRightDisp can be empty)
2013-04-02 13:23:03 +04:00
Andrey Pavlenko
75ea10e6ff
fix for #2806 (missing 'nu03' field of moments)
2013-04-02 12:14:43 +04:00
Andrey Pavlenko
9aa29373b4
this test is unstable (fails from time to time), let's disable it until fixed
2013-04-02 11:39:26 +04:00
yao
f3254b28f2
use clflush replaces clfinish
2013-04-02 14:41:02 +08:00
yao
10f6ebfdf7
fix the crash when calling dft
2013-04-02 11:35:40 +08:00
Vadim Pisarevsky
10702c6d75
fixes in bundle adjustment code by Nils Hasler
2013-04-01 15:20:35 +04:00
Andrey Kamaev
2a1cf23fab
Merge pull request #713 from bitwangyaoyao:2.4_perf
2013-04-01 15:16:48 +04:00
Andrey Kamaev
a3954fb223
Merge pull request #729 from jet47:fix-gpu-windows-build
2013-04-01 15:11:40 +04:00
Andrey Kamaev
aebffb712a
Merge pull request #726 from jet47:fix-pvs-studio-warnings
2013-04-01 15:11:02 +04:00
Andrey Kamaev
52fc9f7794
Merge pull request #725 from taka-no-me:fix_array_create
2013-04-01 15:10:49 +04:00
Vladislav Vinogradov
8e10cd8946
fixed gpu module compilation under windows
2013-04-01 14:15:06 +04:00
Vladislav Vinogradov
b62cf65b91
fixed inconsistent new/delete operators
2013-04-01 11:55:02 +04:00
Vladislav Vinogradov
3d095ccc82
fixed condition in KeyPointsFilter::retainBest
2013-04-01 11:53:43 +04:00
Vladislav Vinogradov
d27d091e59
fixed mind/maxd search in CvFuzzyMeanShiftTracker::SearchWindow::initDepthValues
2013-04-01 11:53:05 +04:00
Vladislav Vinogradov
43f38df1d2
fixed incorrect sizeof() expression in CvCalibFilter::SetCameraCount
2013-04-01 11:37:48 +04:00
Vladislav Vinogradov
3c86788b1f
fixed incorrect sizeof() expression in CvCaptureCAM_VFW::open
2013-04-01 11:35:33 +04:00
Vladislav Vinogradov
d2b093d809
fixed potential dereference of null pointer
2013-04-01 11:31:56 +04:00
Vladislav Vinogradov
ce2284e2e6
removed duplication
2013-04-01 11:29:13 +04:00
Vladislav Vinogradov
5a4fa4607b
fixed misprint in imgwarp.cpp
2013-04-01 11:26:49 +04:00
Vladislav Vinogradov
ae47b8f06c
fixed misprint in icvCreateIsometricImage
2013-04-01 11:23:27 +04:00
Vladislav Vinogradov
10774ff068
removed unnecessary tmp variable (convertTo can work in-place)
2013-04-01 11:18:30 +04:00
Vladislav Vinogradov
b28677bd90
fixed misprint in MatOp::augAssignXor
2013-04-01 11:16:47 +04:00
Andrey Kamaev
87bb7ff558
Merge pull request #721 from jet47:tvl1-bug-fix
2013-03-31 13:46:25 +04:00
Andrey Kamaev
ea5225ef3e
Fix typo leading to heap corruption in OutputArray::create
2013-03-31 13:40:09 +04:00
Ryan Rawson
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
Andrey Kamaev
7d37625fc3
Merge pull request #718 from apavlenko:java_tests_fix
2013-03-29 18:21:14 +04:00
Andrey Kamaev
56d62118d5
Merge pull request #707 from pengx17:2.4_surf
2013-03-29 18:20:45 +04:00
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
2013-03-29 18:20:27 +04:00
Vladislav Vinogradov
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
Alexander Smorkalov
c6cab50c5c
Perf tests for Video IO on WInRT fixed.
2013-03-28 00:15:30 -07:00
Alexander Smorkalov
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 08:03:51 -07:00
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
)
2013-03-27 17:43:00 +04:00
Andrey Kamaev
cdddecbb93
Merge pull request #715 from pengx17:2.4_canny_buf
2013-03-27 13:19:40 +04:00
Andrey Kamaev
db17382d3a
Merge pull request #712 from apavlenko:fix-2912
2013-03-27 13:19:27 +04:00
Alexander Smorkalov
de95a2b278
Video IO tests turned off for ARM WinRT.
2013-03-27 00:45:41 -07:00
peng xiao
04a6ab4144
Fix OCL Canny
2013-03-27 15:08:51 +08:00
peng xiao
f2ecf4f905
Disable ocl::SURF accurate test
2013-03-27 13:25:08 +08:00
yao
5539e85a11
use perf test replace performance sample
2013-03-27 12:04:48 +08:00
peng xiao
ad58c084a9
Fix compiler errors
2013-03-27 08:56:31 +08:00
Alexander Smorkalov
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
2013-03-26 17:19:52 -07:00
Andrey Pavlenko
bbf43e8b16
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
2013-03-26 19:31:16 +04:00
Andrey Kamaev
6c99b5c9e5
Merge pull request #705 from bitwangyaoyao:2.4_oclFix
2013-03-26 18:38:36 +04:00
peng xiao
8ffc15371d
Fix compiler errors
2013-03-26 17:23:38 +08:00
peng xiao
7476bf5cd7
Fix compiler errors
2013-03-26 16:40:30 +08:00
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
2013-03-26 12:33:13 +04:00
peng xiao
9698079ca5
Pass warp size into SURF
2013-03-26 15:48:15 +08:00
peng xiao
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
yao
d6f1ad8c14
more fix
2013-03-26 14:23:26 +08:00
yao
f36db3a037
more fix of mismatch
2013-03-26 14:10:29 +08:00
yao
ad6aae4583
more fix of mismatch functions on CPU OCL
2013-03-26 13:41:13 +08:00
yao
2c06e59a69
fix some mismatch
2013-03-26 13:05:01 +08:00
peng xiao
f7b40cdc63
Add a macro to call additional barrier function on the fly
2013-03-26 11:51:02 +08:00
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +04:00
Vladislav Vinogradov
4d23e2c8c9
GPU implementation of CLAHE
2013-03-25 17:45:13 +04:00
Vladislav Vinogradov
5810a73d30
CPU implementation of CLAHE
2013-03-25 17:44:31 +04:00
Anatoly Baksheev
7fa01e3fcc
enabled png and jpeg for iOS
2013-03-25 11:19:29 +04:00
Andrey Kamaev
ec8aec09ec
Merge pull request #691 from vpisarev:fix_2899
2013-03-22 17:18:55 +04:00
Andrey Kamaev
2c9f651230
Merge pull request #688 from jet47:fix-nonfree-compilation
2013-03-22 17:18:40 +04:00
Andrey Kamaev
c6eb7c3b12
Merge pull request #683 from jet47:gpu-license
2013-03-22 17:18:15 +04:00
Vadim Pisarevsky
a4815cf359
removed extra whitespaces
2013-03-22 15:12:55 +04:00
Vadim Pisarevsky
38693ef37c
fixed http://code.opencv.org/issues/2899
2013-03-22 15:10:54 +04:00
Vadim Pisarevsky
5febc07b6b
Merge pull request #687 from vpisarev:fast_lin_svm2
2013-03-22 14:34:45 +04:00
Vladislav Vinogradov
f0b19d4659
updated license header in whole gpu module
2013-03-22 14:03:15 +04:00
Vladislav Vinogradov
3ef2e1136f
fixed nonfree compilation with gpu (perf tests)
2013-03-22 10:20:57 +04:00
Vadim Pisarevsky
e01335bf47
fixed buffer size and restored the use of compressed files in ml's load_save tests.
2013-03-22 01:53:41 +04:00
Andrey Kamaev
b6365699ee
Merge pull request #664 from taka-no-me/ocl
...
Move OpenCL SURF to nonfree module
2013-03-21 09:01:59 -07:00
Andrey Kamaev
07cd18adaf
Merge pull request #686 from taka-no-me/stereobm_sobel
...
Fixed wrong index in prefilterXSobel function
2013-03-21 08:59:59 -07:00
Andrey Kamaev
8a962d348e
Merge pull request #676 from vpisarev/svd_stuff
...
added test for bug #1448 and hopefully fixes the bug #2898
2013-03-21 08:59:48 -07:00
Andrey Kamaev
172b4554f3
Merge pull request #675 from jet47/gpu-test-fixes
...
GPU test fixes
2013-03-21 08:59:34 -07:00
Vadim Pisarevsky
4331f76d18
add hack to disable optimization of linear svms; improved precision of optimize_linear_svm; add the relevant test, which however requires some big database (so it's disabled by default)
2013-03-21 19:17:59 +04:00
Andrey Kamaev
4bd721ad3b
Fix build errors
2013-03-21 18:37:34 +04:00
Dong Nguyen
73f5697749
Fixed wrong in row index of SSE implementation in prefilterXSobel function.
2013-03-21 18:28:23 +04:00
Andrey Kamaev
1b4afcca30
Move OpenCl SURF perf tests to nonfree and fix build of samples
2013-03-21 18:19:52 +04:00
Andrey Kamaev
77ad07adf3
Disable crashing ocl tests
2013-03-21 18:18:17 +04:00
Andrey Kamaev
7b8ad4cb04
Refactor OpenCL initialization and allow to use ocl module witout explicit setup
2013-03-21 18:18:15 +04:00
Andrey Kamaev
dd678121b3
Trying to make ocl surf work
...
1. Added more sync to reduction.
2. Turned off Image2D feature. Probably its support is not detected correctly.
3. Temporary disabled descriptor tests - can't localize a problem of the ocl descriptor.
2013-03-21 18:16:59 +04:00
Andrey Kamaev
1be58f9a00
SURF accuracy test is moved to nonfree
2013-03-21 18:15:46 +04:00
Andrey Kamaev
6846f881a2
Move OpenCL SURF to nonfree module
2013-03-21 17:59:35 +04:00
Andrey Kamaev
91ac9688a8
Allow OpenCL acceleration in every OpenCV module
2013-03-21 17:57:01 +04:00
Andrey Kamaev
d28df08eb0
Refactor OpenCL search
2013-03-21 17:56:59 +04:00
Vadim Pisarevsky
63a5587d0d
exploring possible bug in optimize_linear_svm
2013-03-21 17:00:08 +04:00
Alexander Smorkalov
7ec2b6bad0
Highgui tests for GUI disabled for WinRT;
...
Warnings fix;
2013-03-21 16:18:19 +04:00
Andrey Kamaev
d756de176f
Merge pull request #679 from jet47:gpu-simd-functions
2013-03-21 14:59:55 +04:00
Vladislav Vinogradov
33ff3d6016
added simd_functions.hpp to device layer
2013-03-21 14:09:19 +04:00
Vladislav Vinogradov
d87b709c26
fixed minMax perf test
2013-03-21 13:46:32 +04:00
Vladislav Vinogradov
0149969463
disable tests that requires video support if it is not available
2013-03-21 13:40:07 +04:00
Vladislav Vinogradov
b07bce11ef
increased epsilon in sanity test
2013-03-21 13:40:07 +04:00
Vladislav Vinogradov
83def21ba9
increased time limits in perf tests
2013-03-21 13:40:07 +04:00
Vladislav Vinogradov
99c49648fa
fixed gpu::LUT on multi device system
2013-03-21 13:39:25 +04:00
Vadim Pisarevsky
321070ccf0
Merge pull request #669 from vpisarev:fast_lin_svm
2013-03-21 12:22:36 +04:00
cuda-geek
ecdc7da6b1
Merge pull request #656 from jet47:gpu-nonfree
2013-03-21 08:57:09 +04:00
Alexander Smorkalov
429cd85b46
More accurate guards for WinRT features in CMake.
2013-03-20 12:21:29 -07:00
Vadim Pisarevsky
9a86245242
added test for bug #1448 and hopefully fixes the bug #2898
2013-03-20 11:58:19 +04:00
Alexander Smorkalov
3d594c70ff
Multiple Windows RT fixes
...
TIFF build was fixed;
Direct Show back-end was enabled;
More accurate guards implemented.
2013-03-19 17:46:01 -07:00
Vadim Pisarevsky
a06af5ca25
dramatic speedup of SVM::predict in the case of linear SVM
2013-03-19 18:28:17 +04:00
Vladislav Vinogradov
0a65f2f4af
merged gpunonfree and nonfree module
2013-03-18 16:14:37 +04:00
Andrey Kamaev
da00252963
Merge pull request #652 from Daniil-Osokin:fixCvtColorHeader
2013-03-18 15:56:33 +04:00
Vladislav Vinogradov
3b065e38be
fixed warnings
2013-03-18 14:06:29 +04:00
Vladislav Vinogradov
fd7bf0b766
moved SURF_GPU and VIBE to gpunonfree module
2013-03-18 14:06:29 +04:00
Vladislav Vinogradov
abc9ef6809
moved utility functions from gpu_perf_test and gpu_test to ts module
2013-03-18 14:06:19 +04:00
Daniil Osokin
e153f0631c
Added missing enums for cvtColor RGB to YUV420p
2013-03-18 10:33:44 +04:00
Vadim Pisarevsky
959a5c980d
Merge pull request #532 from jet47:super-resolution
2013-03-17 19:13:37 +04:00
cuda-geek
1d626194af
Merge pull request #644 from jet47:gpu-debayer-mht
2013-03-15 13:55:03 +04:00
Andrey Kamaev
00d8ad9e7e
Merge pull request #632 from pengx17:2.4
2013-03-15 10:34:43 +04:00
Andrey Kamaev
18ca645fd2
Merge pull request #631 from bitwangyaoyao:2.4_stereo
2013-03-15 10:34:27 +04:00
Vladislav Vinogradov
4a237af814
implemented Malvar, He, and Cutler Bayer Demosaicing on gpu
2013-03-14 18:11:12 +04:00
Andrey Kamaev
ecf770d49d
Merge pull request #638 from bitwangyaoyao:2.4_fixErode
2013-03-14 11:41:02 +04:00
Andrey Kamaev
5f3eb0fc49
Merge pull request #628 from bitwangyaoyao:2.4_fixMoments
2013-03-14 11:40:47 +04:00
peng xiao
34c7162104
Merge remote-tracking branch 'upstream/2.4' into 2.4
2013-03-14 09:24:45 +08:00
Alexander Smorkalov
06aff4e7b0
Initial Windows RT support commit.
...
GPU module turned off;
TIFF support turned off;
Windows Managment and Video IO (VFW) turned off.
2013-03-13 09:02:15 -07:00
yao
084385cf38
Fix a bug in ocl::Erode/Dilate, simplify the host logic
2013-03-12 16:45:43 +08:00
peng xiao
3a565e001e
Remove unnecessary HAVE_OPENCL macro block.
2013-03-12 09:10:15 +08:00
yao
f8985bb7fc
fix warnings on Linux
2013-03-12 08:55:50 +08:00
Andrey Kamaev
1d3219747a
Merge pull request #633 from jet47:gpu-debayer-gray
2013-03-11 21:15:00 +04:00
Andrey Kamaev
632211eb27
Merge pull request #630 from asmorkalov:android_view_stretch
2013-03-11 21:14:43 +04:00
Andrey Kamaev
980fc93b4d
Fix clang + ccache build warnings
2013-03-11 18:41:22 +04:00
Vladislav Vinogradov
4ddf634c30
gpu : implement Bayer* -> Gray color conversion
2013-03-11 15:41:50 +04:00
Andrey Kamaev
ec8637a990
Fix build errors
2013-03-11 14:52:22 +04:00
peng xiao
34998b6034
Add ocl::SURF accurate test.
...
The test cases are ported from gpu module (masked version is still
missing).
Key point direction definition is synchronized with cv::SURF.
nonfree module dependency is added into ocl module's cmake file.
2013-03-11 18:35:30 +08:00
yao
3f81a152b9
remove the OpenCL define
2013-03-11 17:21:31 +08:00
yao
0f0a4c3099
add stereoBM function
2013-03-11 17:10:58 +08:00
Alexander Smorkalov
8942eaf0d7
Stetch support for Android View classes added (Feature #2840 )
2013-03-11 11:17:19 +04:00
yao
7f0d6d42f0
fix mismatch on NV OCL and some AMD GPUs
2013-03-08 10:30:01 +08:00
Andrey Kamaev
13f402a554
Merge pull request #620 from apavlenko:java_tutorial_fix
2013-03-06 15:47:09 +04:00
Andrey Pavlenko
0e64baaec5
removing redundant code
2013-03-06 13:00:00 +04:00
Andrey Pavlenko
116d3be9c0
moving JNI library to 'build/lib' dir on non-Win
2013-03-05 18:41:44 +04:00
Andrey Kamaev
bbac4bc4cf
Merge pull request #491 from Daniil-Osokin:cvtRGB2YUV420p
2013-03-05 15:26:16 +04:00
yao
65bb4250a4
Fix a bug in addWeighted x64 mode
...
And a potential problem in remap
2013-03-01 18:08:53 +08:00
Vadim Pisarevsky
a910360689
Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher
2013-03-01 10:55:11 +04:00
yao
82b9854837
fix compile warnings
2013-03-01 08:47:20 +08:00
Andrey Kamaev
c865b28243
Merge pull request #591 from jet47:gpu-sanity-tests
2013-02-28 18:08:11 +04:00
Andrey Kamaev
79cf292d78
Merge pull request #590 from apavlenko:java_fixes
2013-02-28 18:07:33 +04:00
Andrey Kamaev
fba0e6fc5c
Merge pull request #587 from bitwangyaoyao:2.4_fixHog
2013-02-28 18:06:28 +04:00
Andrey Kamaev
4811988caf
Merge pull request #585 from bitwangyaoyao:2.4_SURF
2013-02-28 18:06:14 +04:00
Andrey Pavlenko
d18b2c2502
patch -> revision
2013-02-28 17:19:52 +04:00
Andrey Pavlenko
c24d7cc066
adding more version-related variables
2013-02-28 16:56:53 +04:00
Vladislav Vinogradov
f533f0dca9
fixed gpu sanity tests
2013-02-28 16:54:37 +04:00
Andrey Pavlenko
5321da92cb
adding/fixing version suffix for desktop java library on all OSes
2013-02-28 16:12:44 +04:00
Andrey Kamaev
d0e340bc80
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend
2013-02-28 15:43:51 +04:00
yao
f12369a53c
Fix ocl::HOG crash on Intel OCL
2013-02-28 16:56:39 +08:00
Andrey Kamaev
831580ef31
Merge pull request #578 from jet47:nmake-ffmpeg-copy
2013-02-28 12:56:26 +04:00
cuda-geek
0771fd82c0
Merge pull request #557 from jet47:gpu-sanity
2013-02-28 11:17:12 +04:00
yao
f791344810
linux warning fix
2013-02-28 14:37:37 +08:00
yao
504008dbe0
Fix ocl::bruteforcematcher crash on Intel OCL
2013-02-28 14:31:08 +08:00
Vladislav Vinogradov
df456245e7
fixed ffmpeg destination folder for NMake generator
2013-02-28 10:16:41 +04:00
yao
7c1f1d8837
fix bug #2787
2013-02-28 14:05:36 +08:00
yao
69eebdd608
fix the blend crash in some cases
2013-02-28 09:03:10 +08:00
Andrey Kamaev
a5d2253be8
Merge pull request #544 from AnnaKogan8:added-regressions-only-option
2013-02-28 00:38:47 +04:00
Andrey Kamaev
0a8711d76b
Merge pull request #576 from bitwangyaoyao:2.4_customMat2
2013-02-27 19:33:54 +04:00
Andrey Kamaev
af13c8604d
Merge pull request #568 from bitwangyaoyao:2.4_moments
2013-02-27 19:33:26 +04:00
yao
cbff75db9e
fix build errors
2013-02-27 21:56:03 +08:00
Vladislav Vinogradov
7a0d6f7733
Super Resolution module
2013-02-27 13:41:15 +04:00
yao
9ccf27c7f5
add interfaces enable custom oclMat device memory type
2013-02-27 17:32:32 +08:00
cuda-geek
5d43ce853e
Merge pull request #559 from jet47:gpu-hough-circles
2013-02-27 12:29:45 +04:00
Andrey Kamaev
1a82ceac9c
Merge pull request #563 from taka-no-me:perf_classify_speedups
2013-02-27 11:37:18 +04:00
Andrey Kamaev
b836e3c65b
Merge pull request #556 from bitwangyaoyao:2.4_SURF
2013-02-27 11:37:04 +04:00
Andrey Kamaev
f03c04c151
Merge pull request #554 from bitwangyaoyao:2.4_impvInterFrame
2013-02-27 11:36:40 +04:00
Andrey Kamaev
c54c7c8b2c
Merge pull request #553 from bitwangyaoyao:2.4_perfTest
2013-02-27 11:36:23 +04:00
yao
dba2ec0539
remove the compile warnings
2013-02-27 14:53:27 +08:00
yao
6df23428af
Add moments function
2013-02-27 13:45:16 +08:00
yao
9ec5333a9b
pyrlk also take advantages of cl_image support detection
2013-02-27 10:45:07 +08:00
yao
da47ccec9c
Put the cl_image support detection in utils
2013-02-27 10:24:03 +08:00
Andrey Kamaev
e9307259d7
Merge pull request #564 from apavlenko:eclipse_import_fix
2013-02-27 00:05:02 +04:00
cuda-geek
0e5255d4fb
Merge pull request #561 from asmorkalov:android_tutorial_2_4_4_update
2013-02-26 19:58:34 +04:00
Andrey Pavlenko
1c1c3c29c3
fixing eclipse import errors
2013-02-26 19:52:59 +04:00
Andrey Kamaev
4d2c864bea
Add option --with-score to summary.py to automatically classify speedups
...
Legend for new column is:
* FASTER - strong speedup
* faster - spedup is detected but it is unreliable
* <empty> - no change in speed
* slower - slowdown is detected but it is unreliable
* SLOWER - strong slowdown
2013-02-26 19:42:51 +04:00
Andrey Kamaev
f6dd3651ea
Merge pull request #552 from taka-no-me:fix_invert
2013-02-26 18:31:30 +04:00
Andrey Kamaev
dcf7a69430
Merge pull request #555 from bitwangyaoyao:2.4_fixFft
2013-02-26 18:31:17 +04:00
yao
04faaa9e35
Fix ocl::dft the compile warning on Linux
2013-02-26 21:18:51 +08:00
Alexander Smorkalov
8458f5c489
Android tutorial updated
...
OpenCV version incremented;
New CvCameraViewListener interface description added.
2013-02-26 16:35:02 +04:00
yao
3ff5689fe5
Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4
2013-02-26 20:30:42 +08:00
Vladislav Vinogradov
10402c8a85
fixed gpu HoughCircles test
2013-02-26 16:10:35 +04:00
Vladislav Vinogradov
c9868fc01f
fixed warp tests
2013-02-26 13:53:39 +04:00
Vladislav Vinogradov
4f7cfbc26e
fixed gpu bitwise operations with scalars
2013-02-26 13:53:39 +04:00
Vladislav Vinogradov
a138e12a26
refactored gpu perf tests and fixed sanity tests
2013-02-26 13:53:38 +04:00
yao
ea433cc496
remove the device specific logic
2013-02-26 17:53:08 +08:00
yao
62f8b0fc48
Fix ocl::dft error when program end on Linux
2013-02-26 17:44:19 +08:00
yao
0ac7f0d374
Simplify the bind texture logic of interpolate frame function
2013-02-26 17:12:03 +08:00
yao
e3a715882e
fix the mismatch of perf_test, add a performance sample for ocl module
2013-02-26 16:52:30 +08:00
Andrey Kamaev
ab221e94c0
Fix invert under MSVC
2013-02-26 11:16:57 +04:00
Anna Kogan
a9b1c5db78
Added --regressions-only=X-FACTOR option
2013-02-26 11:09:17 +04:00
Andrey Kamaev
0d12f451be
Merge pull request #524 from LeonidBeynenson:add_float_and_unsigned_parameters_to_cv_algorithm
2013-02-26 01:00:55 +04:00
Vadim Pisarevsky
416432a8e5
replaced tabs with spaces
2013-02-25 23:10:38 +04:00
Vadim Pisarevsky
087537463d
attempt to make the ultimate fix for the failure in Core_Invert.small
2013-02-25 22:46:30 +04:00
Vadim Pisarevsky
25bbcba0ea
fixed Core_MulSpectrums failure
2013-02-25 22:02:24 +04:00
Daniil Osokin
cf5e272878
Added multithreaded implementation for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
Daniil Osokin
d8f538d67b
Added tests for RGB to YUV420p color conversion
2013-02-25 17:01:07 +04:00
LeonidBeynenson
41dc829341
Made changes to avoid warnings (Windows compilation).
2013-02-25 15:38:59 +04:00
Andrey Kamaev
6082f351ab
Merge pull request #541 from bitwangyaoyao:2.4_fixCvtColor
2013-02-25 14:04:02 +04:00
Andrey Kamaev
b6cdc849db
Merge pull request #540 from hgaspar:244
2013-02-25 14:03:36 +04:00
yao
59ebf4ed9f
Fix the ocl::cvtColor mismatch on some devices
2013-02-25 15:19:39 +08:00