mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-02 07:39:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,310 Commits 6 Branches 126 Tags 3 GiB
8cbb284b7b
Commit Graph

6253 Commits

Author SHA1 Message Date
Roman Donchenko
641bb7ac6b Merge pull request #1737 from vrabaud:2.4 2013-11-07 12:03:30 +04:00
Bo Hu
c88fa27b1d Removed trailing whitespace in cap_qtkit.mm. 2013-11-06 13:33:17 -08:00
Bo Hu
114579c33b Added proper testing of the end of quicktime video files. 
CvCaptureFile::grabFrame() always returns 1 regardless, which causes
dead loop when relying on the return value of VideoCapture::read().
 2013-11-06 13:32:11 -08:00
Ilya Lavrenov
fa15769f39 added CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only) 2013-11-06 23:14:04 +04:00
Ilya Lavrenov
56d943388d speeded up ocl::distanceToCenters 2013-11-06 20:02:31 +04:00
Andrey Pavlenko
296f76a135 Merge pull request #1756 from alalek:ocl_workaround_memory_leaks_with_subbuffer 2013-11-06 18:26:39 +04:00
Harris Gasparakis
a1de91a4fd Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs 2013-11-06 16:48:50 +04:00
Konstantin Matskevich
5304e9f259 extending openCL info dump 2013-11-06 15:20:05 +04:00
Roman Donchenko
370235c07b Merge pull request #1711 from SpecLad:cap-broken-mat 2013-11-06 14:53:08 +04:00
Alexander Alekhin
03646e7e01 ocl: workaround for subbuffer memory leaks 2013-11-06 14:02:41 +04:00
Andrey Pavlenko
43c9157220 Merge pull request #1750 from alalek:ocl_update_documentation 2013-11-06 13:32:00 +04:00
Andrey Pavlenko
a3fa7a243d Merge pull request #1740 from ilya-lavrenov:ocl_corners 2013-11-06 13:31:44 +04:00
Andrey Pavlenko
95767676b7 Merge pull request #1739 from pengx17:2.4_ocl_overload_haar 2013-11-06 13:31:11 +04:00
Roman Donchenko
5c44afa427 Merge pull request #1743 from ilya-lavrenov:ocl_repeat 2013-11-06 13:24:22 +04:00
peng xiao
53d1873776 Revert back test image. 2013-11-06 11:19:26 +08:00
Alexander Alekhin
3952a0df44 ocl: update comments in ocl.hpp 2013-11-05 23:53:52 +04:00
Alexander Alekhin
5a333bfff4 ocl: update documentation 2013-11-05 23:53:51 +04:00
Andrey Pavlenko
be37d99567 Merge pull request #1752 from alalek:ocl_memory_cleanup_workaround 2013-11-05 23:49:37 +04:00
Andrey Pavlenko
14c3560750 Merge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix 2013-11-05 23:49:12 +04:00
Alexander Alekhin
691d5f4187 ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard 2013-11-05 19:43:07 +04:00
Ilya Lavrenov
e544e34eed fixed ocl::copyMakeBorder accuracy test 2013-11-05 18:23:34 +04:00
Alexander Alekhin
7704dbf866 ocl: svm: restore non BLAS version 2013-11-05 15:15:26 +04:00
Alexander Alekhin
9a63508f50 Revert "disable SVM when AMD BLAS is not available" 
This reverts commit d63a38e9bf.

Conflicts:
	modules/ocl/test/test_ml.cpp
 2013-11-05 15:13:30 +04:00
Vincent Rabaud
0b1df62215 add VERBATIM as advised by @SpecLad 2013-11-05 12:02:22 +01:00
Vincent Rabaud
3b0108e4c1 fix the crash as suggested by @SpecLad 2013-11-05 11:18:20 +01:00
Ilya Lavrenov
e7e7e04dce came back to relative error 2013-11-05 14:17:31 +04:00
Ilya Lavrenov
2df53d97c5 added ocl::repeat 2013-11-05 12:23:20 +04:00
peng xiao
2a111f7a6c Let perf/accuracy test of ocl haar uses detectMultiScale api. 
Fix image to be used by perf test.
 2013-11-05 10:40:27 +08:00
Ilya Lavrenov
c89dfd333c fixed warnings in OpenCL kernels 2013-11-04 15:30:00 +04:00
Ilya Lavrenov
a8426e1c12 fixed ocl::cornerHarris, ocl::cornerMinEigenVal and their accuracy tests 2013-11-04 15:16:00 +04:00
peng xiao
8c1eb5bf0e Overload detectMultiScale API for ocl::haar. 2013-11-04 14:59:28 +08:00
Vincent Rabaud
e1b2f593d6 fix crash when path has spaces 
The paths are defined properly with an escape "\ " but you cannot have an escape and
quotes when piping (otherwise, escapes are understood as 2 characters).
So just remove the quotes.
 2013-11-01 19:30:58 +01:00
Andrey Pavlenko
dd942df08b Merge pull request #1736 from alalek:ocl_fix_corner_memory_access 2013-11-01 18:37:35 +04:00
Andrey Pavlenko
2767be9a5e Merge pull request #1731 from perping:2.4_haar 2013-11-01 16:46:18 +04:00
Roman Donchenko
9d263db8aa Merge pull request #1734 from asmorkalov:android_manager_version_inc 2013-11-01 16:39:43 +04:00
Alexander Alekhin
99ae9d9cc1 ocl: corner*: fix memory access in kernels; change error check to relative 2013-11-01 16:38:04 +04:00
Andrey Pavlenko
6c21b85fce Merge pull request #1733 from ilya-lavrenov:cv_remap 2013-11-01 15:53:21 +04:00
Alexander Smorkalov
f027cf80f7 OpenCV Version++. OpenCV Manager Version++. 2013-11-01 15:22:34 +04:00
Ilya Lavrenov
5546f4d77f consistency SSE2 and plain versions of convertMaps and remap 2013-11-01 14:50:41 +04:00
Alexander Alekhin
3b293d6855 ocl: fix testdata for blendLinear 2013-11-01 14:44:13 +04:00
perping
af77111cd6 remove whitespace. 2013-11-01 17:53:35 +08:00
Roman Donchenko
e7e6d9d63c Merge pull request #1729 from ilya-lavrenov:ocl_moments 2013-11-01 11:56:49 +04:00
Roman Donchenko
a9a39a3aa2 Merge pull request #1730 from ilya-lavrenov:ocl_kern_warn 2013-11-01 11:52:09 +04:00
Roman Donchenko
b1bed14ebc Merge pull request #1728 from apavlenko:refactor_vcap_jni 2013-11-01 11:39:44 +04:00
perping
af33c118b4 fixed a bug of haar. 2013-11-01 14:07:10 +08:00
Ilya Lavrenov
a8b7573db0 fixed ocl::Moments test 2013-11-01 00:09:11 +04:00
Ilya Lavrenov
1f9ab2e0ca fixed warnings in ocl kernels 2013-10-31 23:48:02 +04:00
Andrey Pavlenko
dfa5a27bee Merge pull request #1727 from ilya-lavrenov:ocl_warpPerspective 2013-10-31 15:32:34 +04:00
Andrey Pavlenko
fbabc323ed Merge pull request #1726 from melody-rain:2.4_tvl1_ocl 2013-10-31 14:03:36 +04:00
Andrey Pavlenko
bf58049d11 Merge pull request #1724 from ilya-lavrenov:ocl_thresh 2013-10-31 13:55:04 +04:00
Andrey Pavlenko
e80f5bed2d Merge pull request #1710 from melody-rain:2.4_moments_ocl 2013-10-31 13:54:46 +04:00
Ilya Lavrenov
c8aed4996e fixed ocl::warpPerspective 2013-10-31 13:53:11 +04:00
Andrey Pavlenko
a88360bea6 minor refactoring of Android VideoCapture jni code to make it similar to generated one 2013-10-31 12:42:12 +04:00
Jin Ma
3dbcd05407 fixed a typo. 2013-10-31 16:25:50 +08:00
Jin Ma
145ece8f9c removed test for double since not all platforms support double, thus the sanity check cannot pass on all the platforms. 2013-10-31 16:21:08 +08:00
Jin Ma
599cf6bea0 Resolved a bug and used ocl::multiply. 2013-10-31 16:09:33 +08:00
Ilya Lavrenov
1d5f5d2364 vectorized ocl::threshold for single channel images 2013-10-31 12:00:53 +04:00
Jin Ma
1bb47f4bdf modified the copyright info. 2013-10-31 08:47:59 +08:00
Andrey Pavlenko
ef9f690598 Merge pull request #1709 from ilya-lavrenov:ocl_cornerharris 2013-10-31 00:22:37 +04:00
Andrey Pavlenko
5795bb326d Merge pull request #1723 from ilya-lavrenov:ocl_norm 2013-10-31 00:21:29 +04:00
Andrey Pavlenko
ead37e4a29 Merge pull request #1721 from alalek:ocl_fix_filter2D_64F_kernel 2013-10-31 00:21:10 +04:00
Andrey Pavlenko
68c916aa26 Merge pull request #1719 from ilya-lavrenov:ocl_gaussianBlur 2013-10-31 00:20:51 +04:00
Andrey Pavlenko
089cf423a0 Merge pull request #1717 from alalek:ocl_adjust_worksize 2013-10-31 00:20:34 +04:00
Andrey Pavlenko
9751b3204d Merge pull request #1715 from asmorkalov:android_java_bincompat_fix 2013-10-31 00:04:03 +04:00
Roman Donchenko
2f4d68c746 Merge pull request #1718 from SpecLad:have-opencv-ocl 2013-10-30 17:33:03 +04:00
Ilya Lavrenov
16df5b007d disabled upload and download perf tests 2013-10-30 17:08:57 +04:00
Ilya Lavrenov
c674d3cf49 fixed ocl::norm (with NORM_RELATIVE specified) when norm(src2) == 0 2013-10-30 16:48:12 +04:00
Alexander Alekhin
0104f59feb ocl: filter2D: fix processing of kernel with double datatype 2013-10-30 16:27:46 +04:00
Roman Donchenko
c70fbb95a3 Merge pull request #1712 from alalek:ocl_split 2013-10-30 16:18:50 +04:00
Ilya Lavrenov
8dfde47f89 changed eps in ocl::GaussianBlur test 2013-10-30 16:04:48 +04:00
Alexander Alekhin
7b0f018a74 ocl: adjust worksize for filter2D and boxFilter 2013-10-30 15:30:47 +04:00
Roman Donchenko
4bc105c40b Merge pull request #1652 from nghiaho12:kalman 2013-10-30 15:11:26 +04:00
Alexander Alekhin
50d2c1066b ocl: split: update tests and implementation 2013-10-30 14:08:37 +04:00
Roman Donchenko
d07e7897a0 Fixed building with OpenCL, but without the ocl module. 
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
 2013-10-30 14:07:34 +04:00
Alexander Smorkalov
994e07db07 Bug #3276 Java bindings binary compatibility is broken in branch 2.4 fixed. 
New version of Java wrappers' generator uses different wrappers for VideoCapture
on Android and desktop to prevent binary compatibility issues.
 2013-10-30 12:51:49 +04:00
Roman Donchenko
d11921f1a4 Merge pull request #1675 from krodyush:opencl-optimization 2013-10-30 12:28:31 +04:00
Jin Ma
7469c2eb9d fixed a bug when double is not supported. 2013-10-30 14:37:13 +08:00
Ilya Lavrenov
bf6b5ee925 fixed extrapolation for ocl::cornerMinEigenVal and ocl::cornerHarris; enabled CV_32FC1 for the first function 2013-10-29 19:59:21 +04:00
Roman Donchenko
d6a7a6d503 VideoCapture: copy the captured frame, to avoid dangling Mats 
Previously, VideoCapture::retrieve would return a Mat that referenced
the internal IplImage. Since the latter is rewritten every time a
frame is captured, it means that if the user captures two frames in a row,
the first frame would reference nothing. Similar if a user captures a frame,
then destroys the VideoCapture instance.

Note that the other branch of the if isn't affected, since flip allocates
a new Mat.
 2013-10-29 18:47:08 +04:00
Jin Ma
b6b190df5c Rewrote moments of opencl version. 2013-10-29 18:05:29 +08:00
Andrey Pavlenko
c5e8a9a29b Merge pull request #1702 from alalek:ocl_memory_corruption_check 2013-10-29 11:07:04 +04:00
Andrey Pavlenko
c6a01f2641 Merge pull request #1688 from alalek:ocl_fix_filters 2013-10-29 11:05:10 +04:00
Andrey Pavlenko
ea64589164 Merge pull request #1687 from bitwangyaoyao:2.4_fix 2013-10-29 11:03:34 +04:00
Andrey Pavlenko
f4b8babbc8 Merge pull request #1677 from pengx17:patch-1 2013-10-29 11:00:26 +04:00
Andrey Pavlenko
42c4f91ef4 Merge pull request #1495 from StevenPuttemans:bugfix_3282 2013-10-29 10:51:01 +04:00
Andrey Pavlenko
9bfa346c38 Merge pull request #1544 from ilya-lavrenov:ocl_blendLinear 2013-10-29 10:49:46 +04:00
Andrey Pavlenko
e52459a324 Merge pull request #1708 from ilya-lavrenov:ocl_threshold 2013-10-29 10:43:44 +04:00
Andrey Pavlenko
106d5eda5f Merge pull request #1700 from ilya-lavrenov:ocl_bitwise_perf 2013-10-29 10:43:27 +04:00
Andrey Pavlenko
acadfcff2d Merge pull request #1707 from ilya-lavrenov:ocl_morph 2013-10-29 10:38:23 +04:00
Andrey Pavlenko
2b05dc7d1e Merge pull request #1699 from ilya-lavrenov:ocl_minMax 2013-10-29 10:35:58 +04:00
Andrey Pavlenko
5fa6d70ab0 Merge pull request #1695 from ilya-lavrenov:ocl_showDiff 2013-10-29 10:35:42 +04:00
Ilya Lavrenov
c49c3e0a91 fixed and generalized ocl::blendLinear 2013-10-28 23:56:40 +04:00
Ilya Lavrenov
58be2546ca fixed OpenCL morph operations for case when kernel does not have zero element 2013-10-28 20:09:49 +04:00
Alexander Alekhin
b10e1e5c7e ocl: filters: update documentation 2013-10-28 20:09:49 +04:00
Alexander Alekhin
98f73705df ocl: fix morph filters 2013-10-28 20:09:49 +04:00
Alexander Alekhin
0f95f0d8b3 ocl: rewrite filter2D 2013-10-28 20:09:49 +04:00
Alexander Alekhin
0bf9ece998 ocl: rewrite boxFilter 2013-10-28 20:09:49 +04:00
Alexander Alekhin
cb6ea8bfa1 ocl: update filter tests 2013-10-28 20:09:49 +04:00
Roman Donchenko
529f086b62 Merge pull request #1691 from SpecLad:ffmpeg-test 2013-10-28 19:35:08 +04:00
Alexander Alekhin
447c052e59 ocl: memory corruption check 2013-10-28 19:33:00 +04:00
Andrey Pavlenko
95bd32b516 Merge pull request #1705 from ilya-lavrenov:ocl_flip 2013-10-28 19:02:24 +04:00
Andrey Pavlenko
bb15c00665 Merge pull request #1703 from bitwangyaoyao:2.4_fix1480 2013-10-28 19:01:51 +04:00
Andrey Pavlenko
d3c0b36cd0 Merge pull request #1701 from alalek:ocl_fix_canny 2013-10-28 19:01:13 +04:00
Andrey Pavlenko
1cc58f9770 Merge pull request #1698 from ilya-lavrenov:ocl_warp 2013-10-28 18:59:08 +04:00
Ilya Lavrenov
7afbae57ba fixed ocl::minMax for FP-types 2013-10-28 18:49:16 +04:00
Ilya Lavrenov
eb2f8a2948 ocl tests: show diff when cv::countNonZero(diff) > 0 2013-10-28 18:20:02 +04:00
Ilya Lavrenov
1f7f9c9682 rewrote and generalized ocl::threshold 2013-10-28 18:11:24 +04:00
Ilya Lavrenov
e70dfe5a50 fixed OpenCL morph operations for case when kernel does not have zero element 2013-10-28 16:46:41 +04:00
Ilya Lavrenov
cf5df1a7e7 fixed ocl::flip 2013-10-28 13:57:29 +04:00
Roman Donchenko
d3bcf609f1 Merge pull request #1657 from KonstantinMatskevich:ocldistanceToCenters 2013-10-28 13:46:32 +04:00
yao
0fd872bfa9 fix bug #1480 2013-10-28 17:36:43 +08:00
yao
632452cdd8 fix the mismatch running on cpu devices 2013-10-28 16:32:46 +08:00
Roman Donchenko
88f5ef9acc Merge pull request #1696 from apavlenko:fix_typo_GpuMaterials 2013-10-28 12:18:42 +04:00
Peng Xiao
ab2bd58f5c Fixed a missing barrier. 2013-10-28 14:17:59 +08:00
konstantin
973137c78e fix bugs on host and device sides for imgprog_sobel3.cl 2013-10-28 00:14:07 +04:00
Alexander Alekhin
eb4f50ca59 ocl: Canny: port CUDA-based implementation of edgesHysteresisLocal 2013-10-28 00:10:47 +04:00
Ilya Lavrenov
900c303636 added performance tests for ocl::bitwise_or and ocl::bitwose_xor 2013-10-27 20:08:50 +04:00
Alexander Alekhin
9e527fc9f4 ocl: Canny: replace unsafe buffer to oclMat 2013-10-27 18:55:42 +04:00
Ilya Lavrenov
839245e420 fixed tests for ocl::warpAffine and ocl::warpPerspective 2013-10-27 14:49:37 +04:00
konstantin
ddd2b106fb rename imageproc_sobel2.cl -> imageproc_sobel3.cl for consistency 2013-10-25 21:44:01 +04:00
Andrey Pavlenko
66e5be2d64 Merge pull request #1655 from pengx17:2.4_opt_superres_ocl 2013-10-25 19:47:38 +04:00
Andrey Pavlenko
fc64a4071c Merge pull request #1689 from ilya-lavrenov:ocl_bilateralFilter 2013-10-25 19:41:56 +04:00
Andrey Pavlenko
4e57f92e6e Merge pull request #1692 from ilya-lavrenov:ocl_separableFilter 2013-10-25 19:39:21 +04:00
Andrey Pavlenko
d60924f4f2 Merge pull request #1694 from apavlenko:fix_typo 2013-10-25 19:35:19 +04:00
Andrey Pavlenko
2e5db6e56c fixing typo 2013-10-25 18:53:24 +04:00
Andrey Pavlenko
2b6fca68bf fixing typo 2013-10-25 18:00:46 +04:00
Ilya Lavrenov
e1596d69cc fixed extrapolation in ocl::adaptiveBilateralFilter 2013-10-25 17:29:21 +04:00
Ilya Lavrenov
b33a62beb0 fixed separable filter extrapolation 2013-10-25 17:08:44 +04:00
Roman Donchenko
36b5180aa1 Another FFmpeg fix from master. 
From commit dd74a851, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.

Also modified some gpu sources in a similar manner.
 2013-10-25 16:08:14 +04:00
peng xiao
68a8a11161 Rewrite distanceToCenters. 
It supports NORM_L1 distance types now and can
use user provided indices.
Also fixed a bug of kmeans where distance pointers should be float instead
 of double.

NORM_L2 changed to NORM_L2SQR, Accuracy and Perf tests are added

added ROI support in accuracy test of distanceToCenters
 2013-10-25 15:02:00 +04:00
Roman Donchenko
1188894133 Fixed indentation in CV_FFmpegWriteBigVideoTest::run. 2013-10-25 14:37:54 +04:00
Roman Donchenko
2ca49eef37 Added stupid hacks to make the video tests pass with FFmpeg 2.0.2. 
Need to go back at some point and fix this for real.

(cherry picked from commit dfe07df87b)
 2013-10-25 14:34:02 +04:00
Roman Donchenko
5a5d569d72 Changed MPEG-2 resolution in the FFmpeg test. 
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e

(cherry picked from commit 424a7b0ab0)

Conflicts:
	modules/highgui/test/test_ffmpeg.cpp
 2013-10-25 14:31:27 +04:00
Roman Donchenko
260c2e0b08 Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp. 
(cherry picked from commit 3f3ae33327)
 2013-10-25 14:29:37 +04:00
Ilya Lavrenov
9ea6001d08 enabled ocl::bilateralFilter ROI testing 2013-10-25 13:32:35 +04:00
Andrey Pavlenko
f177e65871 Merge pull request #1683 from alalek:ocl_restore_showdiff 2013-10-25 13:19:02 +04:00
yao
dd0fa63ca8 fix the bug of ocl::bruteForceMatcher 2013-10-25 16:01:41 +08:00
Roman Donchenko
3b08bf6b62 Merge pull request #1682 from SpecLad:Wmissing-declarations 2013-10-24 22:19:17 +04:00
Roman Donchenko
496859a944 Merge pull request #1643 from alalek:cmake_fix_java_link_rules 2013-10-24 19:38:43 +04:00
Alexander Alekhin
4b17d073c0 cmake: fix linker dependencies for opencv_java 
Linker dependencies to all OpenCV modules are invalid.
We should not include other bindings in this list (like "opencv_python").
 2013-10-24 19:04:59 +04:00
Roman Donchenko
f51e490bad Fixed a Wmissing-declarations warning when compiling with MinGW. 2013-10-24 18:35:08 +04:00
Ilya Lavrenov
dab3000778 fixed bug in ocl::equalizeHist 2013-10-24 13:59:25 +04:00
Andrey Pavlenko
2279c209c8 Merge pull request #1676 from ilya-lavrenov:ocl_resize_test 2013-10-24 11:23:55 +04:00
Andrey Pavlenko
931a2ae14f Merge pull request #1673 from ilya-lavrenov:ocl_norm 2013-10-24 11:23:36 +04:00
Andrey Pavlenko
e7f39eb46e Merge pull request #1672 from ilya-lavrenov:ocl_arithm 2013-10-24 11:23:19 +04:00
Andrey Pavlenko
4cf598a862 Merge pull request #1669 from ilya-lavrenov:ocl_copyMakeBorder 2013-10-24 11:23:01 +04:00
Peng Xiao
4b712eeded Update imgproc_canny.cl 
Reordering condition checking.
 2013-10-24 12:07:54 +08:00
Alexander Alekhin
133d889e33 ocl: show diff 2013-10-24 03:44:56 +04:00
konstantin
9f0995fbe0 try to made compatible with mac 2013-10-23 23:56:22 +04:00
Ilya Lavrenov
5864895ec6 fixed ocl::copyMakeBorder 2013-10-23 23:52:05 +04:00
konstantin
ebb2c3e01f try to fix build error 2013-10-23 23:18:21 +04:00
Ilya Lavrenov
7c1443cbdd fixed an accuracy test for ocl::resize (in some cases dsize.area() was equal to 0) 2013-10-23 22:13:18 +04:00
konstantin
2f62940a0e Added few opencl optimizations (as Intel platform codepath): 
1. HaarDetetctor: repack nodes to reduce memory footprint
2. cornerMinEigVal: 4 ocl kernels are fused into 1 for sobel calculation
 2013-10-23 20:38:11 +04:00
Ilya Lavrenov
29499ed51a moved to relative errors in ocl::norm tests 2013-10-23 19:53:04 +04:00
Ilya Lavrenov
87fc3441f2 workaround for cv::multiply bug 2013-10-23 18:42:55 +04:00
Roman Donchenko
bb461fab34 Merge pull request #1649 from asandwhich:2.4 2013-10-22 19:16:09 +04:00
Alexander Alekhin
e7fd053478 ocl: fix FFT initialization 2013-10-21 19:48:36 +04:00
Alexander Alekhin
9acca12d2d ocl: workaround for ProgramCache cleanup issue, use RAII to print kernel build error 2013-10-21 19:16:33 +04:00
Andrey Pavlenko
aec7d9c1db Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative 2013-10-21 16:06:36 +04:00
Andrey Pavlenko
0ad04d66e3 Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix 2013-10-21 16:00:13 +04:00
Andrey Pavlenko
e82fd12a67 Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations 2013-10-21 15:59:19 +04:00
Andrey Pavlenko
bd1a1cc031 Merge pull request #1633 from ilya-lavrenov:ocl_imgproc 2013-10-21 15:59:00 +04:00
Ilya Lavrenov
9d923b50ac fixed ocl::Laplacian for case when scale != 1 2013-10-21 14:27:34 +04:00
Ilya Lavrenov
6085c416a7 missed initialization of kernel size 2013-10-21 14:27:14 +04:00
Roman Donchenko
599d51ec14 Merge pull request #1651 from ilya-lavrenov:misprint 2013-10-21 14:00:23 +04:00
peng xiao
7285341083 1. Let btvRegWeights to be constant per process call. 
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
 2013-10-21 10:21:37 +08:00
Nghia Ho
2238e711b5 Copied errorCovPre to errorCovPost. This allows the correct behaviour of the uncertainty to grow when there is missing data for each predict step. 2013-10-20 13:00:11 +11:00
Ilya Lavrenov
4f68f35a78 added reflect, reflect101, replicate, wrap border types to ocl::remap 2013-10-19 23:38:50 +04:00
Ilya Lavrenov
bebc1c9330 misprint 2013-10-19 22:59:47 +04:00
Kevin
8f995fac88 Change intrinsic camera matrix initialization 
In the function cvInitIntrinsicParams2D the principal point for
normalized image coordinates is set to 0/0. This updates the function
to initialize the principal point at 0.5/0.5.
 2013-10-19 02:10:20 -05:00
Ilya Lavrenov
e9cef2990e made more demonstrative message about test fails 2013-10-19 01:17:46 +04:00
Andrey Pavlenko
d50f0d2ed2 Merge pull request #1587 from alalek:opencl_khronos_headers 2013-10-18 18:41:13 +04:00
Roman Donchenko
83b36dcbcf Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix 2013-10-18 18:39:08 +04:00
Roman Donchenko
d700cc60be Merge pull request #1641 from jet47:imshow-opengl-fix 2013-10-18 18:23:00 +04:00
Ilya Lavrenov
022b5d6c74 refactored ocl matrix operations accuracy tests 2013-10-18 17:36:38 +04:00
Ilya Lavrenov
b3e1a4598c enabled double in copyMakeBorder kernel 2013-10-18 16:46:51 +04:00
Ilya Lavrenov
2681cef5d7 rewrote ocl::remap 2013-10-18 16:41:09 +04:00
Ilya Lavrenov
3fe74ad124 fixed ocl::copyMakeBorder 2013-10-18 16:39:47 +04:00
Ilya Lavrenov
36342eb425 added ROI support to ocl::convolve 2013-10-18 16:36:11 +04:00
Ilya Lavrenov
110a92c126 added ROI support to ocl::columnSum 2013-10-18 16:33:48 +04:00
Ilya Lavrenov
60f9ba0c64 added ROI support to ocl::CLAHE 2013-10-18 16:31:52 +04:00
Ilya Lavrenov
4a81be7d0b refactored all the tests in ocl/test/test_imgproc.cpp 2013-10-18 16:29:10 +04:00
Alexander Alekhin
fd4e705b14 ocl: update autogenerated code 2013-10-18 15:47:11 +04:00
Alexander Alekhin
6344da9ac3 ocl: force to use Khronos OpenCL headers 2013-10-18 15:47:11 +04:00
Andrey Pavlenko
4cbf0cb31e Merge pull request #1640 from alalek:ocl_fix_exp_test 2013-10-18 13:45:12 +04:00
Andrey Pavlenko
97dfd65007 Merge pull request #1626 from ilya-lavrenov:ocl_filters 2013-10-18 13:44:41 +04:00
Vladislav Vinogradov
fa70f95272 fix imshow under Windows with OpenGL support: 
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
 2013-10-17 20:58:33 +04:00
Alexander Alekhin
4bfeeb0738 ocl: perf: use RELATIVE_ERROR in SANITY_CHECK for exp/log/pow 2013-10-17 19:00:36 +04:00
Roman Donchenko
578e984739 OpenCV 2.4.6.2 (Tegra detection and native camera update) 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iF4EABEIAAYFAlIxuvoACgkQdDiF7KIeJGrdaQEA0cMV6JhnsWSnZbRCd3RzyXD7
 8mf7qrSjIV9ty1UL9AMA/0d4iUIm/iEiBIEP0DbsshX+trN5kXsH5woriScbZMGS
 =WeoS
 -----END PGP SIGNATURE-----

Merge tag '2.4.6.2' into 2.4

OpenCV 2.4.6.2 (Tegra detection and native camera update)
 2013-10-17 17:19:04 +04:00
Roman Donchenko
fb7b4d2d60 Merge pull request #1636 from ilya-lavrenov:ocl_loop_times 2013-10-17 17:00:45 +04:00
Roman Donchenko
88cc054f10 Merge pull request #1369 from StevenPuttemans:fix_featuretracker 2013-10-17 15:42:38 +04:00
Ilya Lavrenov
07aee1a25c made LOOP_TIMES as a command line option with default value=1 2013-10-17 12:40:16 +04:00
Roman Donchenko
d411041c53 Merge pull request #1637 from SpecLad:run-py-java-fix 2013-10-17 12:25:31 +04:00
Ilya Lavrenov
da3b7c79b8 refactored filters in the ocl module; added an accuracy tests for ocl::medianFilter 2013-10-17 12:23:56 +04:00
Andrey Pavlenko
7605426dc3 Merge pull request #1613 from alalek:ocl_cvtcolor 2013-10-17 12:07:20 +04:00
Alexander Alekhin
ce0647c9b6 ocl: rewrite CvtColor tests, added roi support 2013-10-16 22:46:21 +04:00
Roman Donchenko
5bb6949bd6 Fix running Java tests with run.py on everything other than Windows. 
Previously, run.py would assume that the opencv_java library is in the
same directory as the tests, which is only true on Windows.

The library path depends on the build configuration, which may not be
known until the actual build (e.g. with the Visual Studio generators),
so it can't be stored in the CMake cache for run.py to read. I didn't
want to hardcode into run.py where the library is on each platform,
either. So that's why I used the current scheme with the properties
file. It also makes running the tests without run.py a little easier.
 2013-10-16 19:22:01 +04:00
Alexander Alekhin
2a9d24323c cmake: add opencv_java into list of exported targets (fix for android) 2013-10-16 17:23:44 +04:00
Roman Donchenko
b420c0b160 Merge pull request #1630 from SpecLad:java-deprecated-assert 2013-10-15 18:36:15 +04:00
Roman Donchenko
a61d1e6494 Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x. 
We don't use it, anyway.
 2013-10-15 17:10:12 +04:00
Roman Donchenko
7ff91665cf In Java bindings, wrap version constants into functions to prevent inlining. 
Java inlines static finals if they're defined with a constant expression. In
case of version constants we don't want that to happen, since they obviously
change from version to version. If the user substitutes a different OpenCV
jar without recompiling, we want user code to still have relevant values for
the version constants.

This arranges that by turning constant values into function calls, which no
longer count as a constant expression.
 2013-10-15 15:44:26 +04:00
Roman Donchenko
7fb18a2311 Merge pull request #1620 from SpecLad:record-build-type 2013-10-15 14:59:53 +04:00
Ilya Lavrenov
741e0242b3 replaced to_string by cv::format 2013-10-15 13:26:01 +04:00
Roman Donchenko
cf71ff0845 Record OpenCV build type among the test properties. 
Because apparently I love running performance tests for debug builds.
 2013-10-15 12:09:31 +04:00
Roman Donchenko
1eb322fa5d Merge pull request #1622 from a0byte:2.4 2013-10-15 11:51:40 +04:00
Andrey Pavlenko
97da1419e1 Merge pull request #1573 from alalek:perf_simple_strategy 2013-10-14 19:28:49 +04:00
Andrey Pavlenko
7f15ec9d54 Merge pull request #1617 from ilya-lavrenov:ocl_info 2013-10-14 19:27:01 +04:00
Han Qiang
88f68a3fe0 Fixed typo in document. 
Signed-off-by: Han Qiang <a0byte@gmail.com>
 2013-10-14 23:23:59 +08:00
Ilya Lavrenov
ca26028415 demonstrative device info output 2013-10-14 17:18:25 +04:00
Andrey Pavlenko
9e12306d95 Merge pull request #1614 from ilya-lavrenov:ocl_svm_misprint 2013-10-14 16:43:18 +04:00
Andrey Pavlenko
e90a9e810d Merge pull request #1612 from alalek:ocl_fix_string_info 2013-10-14 16:41:43 +04:00
Andrey Pavlenko
ae56eaa563 Merge pull request #1609 from ilya-lavrenov:ocl_some_optimization 2013-10-14 16:41:25 +04:00
Ilya Lavrenov
28f566b843 misprint in disabling ocl::svm 2013-10-13 23:54:09 +04:00
Ilya Lavrenov
b18101b15a some optimization of binary ocl::bitwise operations 2013-10-13 23:25:59 +04:00
Ilya Lavrenov
da607c6711 ocl::cvtColor works with ROI properly 2013-10-13 23:09:14 +04:00
Alexander Alekhin
376cd8f84f perf: added simple collection strategy 2013-10-12 18:05:57 +04:00
Alexander Alekhin
f617c0d4a2 ocl: fix for get string info from OpenCL 2013-10-12 16:56:21 +04:00
Andrey Pavlenko
c5afaa4e8d Merge pull request #1610 from alalek:ocl_fix_perf_kalman 2013-10-12 16:31:02 +04:00
Andrey Pavlenko
19dca324ae Merge pull request #1608 from alalek:fix_warn_upd_haar 2013-10-12 16:24:04 +04:00
Andrey Pavlenko
f9fe1b9b09 Merge pull request #1607 from ilya-lavrenov:ocl_fft_cleanup 2013-10-12 16:12:05 +04:00
Andrey Pavlenko
a55cc60136 Merge pull request #1606 from ilya-lavrenov:ocl_imgproc 2013-10-12 16:10:04 +04:00
Andrey Pavlenko
9f5cda799f Merge pull request #1602 from alalek:ocl_test_dump_info 2013-10-12 16:08:24 +04:00
Andrey Pavlenko
4e31a3df24 Merge pull request #1603 from ilya-lavrenov:ocl_disable_svm_noblas 2013-10-12 16:04:05 +04:00
Alexander Alekhin
4413bee693 ocl: reverted type of perf test params for Kalman filter 2013-10-12 02:36:53 +04:00
Ilya Lavrenov
dfbea3518a refactored ocl/src/imgproc.cpp 2013-10-11 23:39:41 +04:00
Ilya Lavrenov
5a309e8f6e fft cleanup ignoring 2013-10-11 20:25:03 +04:00
ilya-lavrenov
d63a38e9bf disable SVM when AMD BLAS is not available 2013-10-11 19:25:34 +04:00
Alexander Alekhin
723af15228 ocl: fix warnings from GCC 4.8, update Haar 2013-10-11 18:42:17 +04:00
Alexander Alekhin
1980aad8d7 ocl: dump device info in tests 2013-10-11 18:24:59 +04:00
Alexander Alekhin
3b0823db7e ocl: fix CV_EXPORTS usage (misplaced in functions declarations) 2013-10-11 18:07:38 +04:00
Alexander Alekhin
ce1177151e ocl: fix cleanup in static builds 2013-10-11 18:07:38 +04:00
Alexander Alekhin
57120c1a60 ocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default) 2013-10-11 17:16:03 +04:00
ilya-lavrenov
ca32583fdd fixed ocl optical flow: sparse and tvl1 2013-10-11 13:55:49 +04:00
Andrey Pavlenko
171e0e62ec Merge pull request #1599 from ilya-lavrenov:ocl_mac_kernel_warnings 2013-10-11 12:40:12 +04:00
Andrey Pavlenko
b7f1edccfb Merge pull request #1595 from alalek:cl_code_cleanup 2013-10-11 12:37:42 +04:00
Alexander Alekhin
238550cdad ocl: code cleanup, fix .clb files 2013-10-11 01:19:46 +04:00
Andrey Pavlenko
dfbd5021fd Merge pull request #1598 from alalek:ocl_fix_build_mac 2013-10-11 00:40:06 +04:00
Ilya Lavrenov
1be77dd2f3 enabled accuracy tests for the functions that use inside AMD Blas/Fft 2013-10-11 00:37:52 +04:00
Alexander Alekhin
0760fdcbdb ocl: fix build on Mac 2013-10-10 23:11:48 +04:00
Ilya Lavrenov
1f51e6c0de fixed kernel compilation warnings on MacOSX 2013-10-10 22:56:39 +04:00
Ilya Lavrenov
39c1e5ff73 added perf tests for min, max, abs 2013-10-10 21:54:38 +04:00
Andrey Pavlenko
ad1ba56fcf Merge pull request #1597 from alalek:ocl_fix_cleanup 2013-10-10 19:02:29 +04:00
Andrey Pavlenko
c820777967 Merge pull request #1596 from alalek:test_fix_run_py 2013-10-10 19:02:10 +04:00
Andrey Pavlenko
3b1c53fa8d Merge pull request #1551 from alalek:cmake_install_win 2013-10-10 18:20:35 +04:00
Alexander Alekhin
3eba2011b9 test: run.py: return valid errorCode in case of the single test run 2013-10-10 17:17:10 +04:00
Alexander Alekhin
6b9f74ae84 ocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft) 2013-10-10 16:58:45 +04:00
Andrey Pavlenko
d5723480e1 Merge pull request #1592 from alalek:ocl_program_cache_update 2013-10-10 15:55:58 +04:00
Andrey Pavlenko
a351161fd7 Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h 2013-10-10 15:55:13 +04:00
Ilya Lavrenov
9d1636daa6 catching OpenCL double not supported exceptions 2013-10-10 12:45:55 +04:00
Alexander Alekhin
d26f62569d ocl: fix compilation warnings, update openCLExecuteKernelInterop 2013-10-10 00:15:02 +04:00
Alexander Alekhin
43c638d07d ocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms) 2013-10-09 23:53:25 +04:00
Alexander Alekhin
bc089bb18c cmake: update java module install rules 2013-10-09 17:49:11 +04:00
Alexander Alekhin
4adede4246 cmake: python module updates 2013-10-09 17:49:11 +04:00
Alexander Alekhin
555c505b70 update cmake 'install' target for Windows platform 
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
 2013-10-09 17:49:10 +04:00
Ilya Lavrenov
d57a7008f1 fixed cmd parser when arg is like -+ 2013-10-09 17:42:36 +04:00
Ilya Lavrenov
fccd37de7e changes eps for NORM_L1 2013-10-09 14:18:07 +04:00
Ilya Lavrenov
488e6aafaf fixed the PR 1582 2013-10-09 14:16:36 +04:00
Andrey Pavlenko
6b69a66c3c Merge pull request #1579 from ilya-lavrenov:ocl_norm 2013-10-09 13:52:20 +04:00
Andrey Pavlenko
ff8e5a04a4 Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix 2013-10-09 13:49:34 +04:00
Ilya Lavrenov
245ff93544 ocl setto fix for windows 2013-10-08 19:11:32 +04:00
Ilya Lavrenov
bdd5038da4 ocl setto fix for windows 2013-10-08 18:52:32 +04:00
Sebastian Krmer
3696174b14 fix documentation warning 2013-10-08 16:49:20 +02:00
Ilya Lavrenov
c404da784f fixed ocl::norm (previously the function used double as a work type) 2013-10-08 18:43:49 +04:00
Sebastian Krämer
4ffd3fb905 add ocl::abs 2013-10-08 15:23:24 +02:00
Sebastian Krämer
c844bbdd82 documentation update for ocl::min and ocl::max 2013-10-08 15:23:18 +02:00
Sebastian Krämer
33df7131ae add ocl::min and ocl::max (includes accuracy tests update) 2013-10-08 15:23:13 +02:00
Roman Donchenko
ae851af648 Merge pull request #1574 from alalek:svm_workaround 2013-10-08 15:31:42 +04:00
Roman Donchenko
65ec9f77d9 Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12 2013-10-08 15:15:31 +04:00
Roman Donchenko
bc3669bfb1 Merge pull request #1576 from alalek:ocl_fix_cl_double 2013-10-08 14:20:11 +04:00
Roman Donchenko
895308a811 Merge pull request #1538 from StevenPuttemans:bugfix_3283 2013-10-08 13:00:39 +04:00
Roman Donchenko
ec409a436d Merge pull request #1545 from alalek:ocl_test_fix_rng 2013-10-08 12:59:50 +04:00
Ilya Lavrenov
32f11e6f40 enabled OpenCL 1.2 branch in oclMat::setTo 2013-10-08 12:49:29 +04:00
Roman Donchenko
95b3a344d9 Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix 2013-10-08 12:32:57 +04:00
Alexander Alekhin
1d6327ba2a ocl: fix Context::CL_* usage 2013-10-08 12:23:46 +04:00
Alexander Alekhin
f63b0dfaf4 svm: disable failed tests 2013-10-07 18:17:10 +04:00
Roman Donchenko
801054d611 Merge pull request #1566 from SpecLad:Wshadow-openni 2013-10-07 15:48:40 +04:00
Ilya Lavrenov
036e99d03a fixed ipp-related warnings 2013-10-05 14:54:00 +04:00
Roman Donchenko
46eeb106e2 Merge pull request #1564 from alalek:cl_runtime_fix_32bit 2013-10-04 18:29:04 +04:00
Roman Donchenko
0a13510293 Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update 2013-10-04 18:25:44 +04:00
Roman Donchenko
2660f4bc59 Merge pull request #1562 from ilya-lavrenov:ocl_integral 2013-10-04 18:12:43 +04:00
Roman Donchenko
aa80250a3d Merge pull request #1532 from alalek:stereo_csbp 2013-10-04 16:43:51 +04:00
Roman Donchenko
1b51270617 Merge pull request #1558 from SpecLad:Wparentheses-equality 2013-10-04 16:32:09 +04:00
Alexander Alekhin
de0f310e81 ocl: tests: RNG usage refactoring 2013-10-04 15:39:39 +04:00
Roman Donchenko
3cfad385ec Fix a -Wshadow warning in cap_openni.cpp. 2013-10-04 14:23:06 +04:00
Roman Donchenko
ca65fe4548 Merge pull request #1535 from asmorkalov:android_ndk_r9 2013-10-04 14:14:20 +04:00
StevenPuttemans
2f474db27f Fix of bug #3283 and bug #3301 
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.
 2013-10-04 11:19:45 +02:00
Alexander Alekhin
90df620deb ocl: stereo_csbp: divUp -> roundUp 2013-10-04 12:48:26 +04:00
Alexander Alekhin
2d1a6687f9 autogenerated code 2013-10-04 12:40:08 +04:00
Alexander Alekhin
2fdfa37ea5 ocl: runtime, fix 32-bit builds 2013-10-04 12:40:08 +04:00
Ilya Lavrenov
10d60f99dc fixed ocl::integral and enabled perf test for it 2013-10-04 12:33:14 +04:00
Ilya Lavrenov
5f81988699 refactored arithm binary operations in order to make them more scalable 2013-10-04 12:13:22 +04:00
Alexander Alekhin
d74ca7b39d ocl: update module documentation 2013-10-03 23:26:06 +04:00
Alexander Alekhin
7f0680fc8b ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp 2013-10-03 23:26:06 +04:00
Alexander Alekhin
8beb514ecf ocl: merge with upstream/2.4 2013-10-03 23:26:06 +04:00
Alexander Alekhin
16adbda4d3 ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable 2013-10-03 19:50:14 +04:00
Alexander Alekhin
dd9ff587dc ocl: file-based ProgramCache refactoring 2013-10-03 19:50:14 +04:00
Alexander Alekhin
b00f79ac5f ocl: move program names into opencl_kernels.hpp 2013-10-03 19:50:14 +04:00
Alexander Alekhin
e8d9ed8955 ocl: split initialization.cpp into 3 files: context, operations, programcache 2013-10-03 19:50:14 +04:00
Ilya Lavrenov
dafd4da031 removed ocl::minMax_buf, updated doc (operation on matrices) 2013-10-03 18:19:15 +04:00
Roman Donchenko
fa9d092c43 Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp. 2013-10-03 12:04:57 +04:00
Alexander Smorkalov
1aaeb52a4c Android NDK r9 support. x64 NDK support fix for MacOS X. 2013-10-03 11:36:12 +04:00
Ilya Lavrenov
adca219f18 fixed convertC3C4 and convertC4C3 functions in case cols == 1 2013-10-03 10:45:15 +04:00
Andrey Pavlenko
88419f8923 Merge pull request #1507 from pengx17:2.4_fix_test 2013-10-02 19:52:12 +04:00
Andrey Pavlenko
73744904a2 Merge pull request #1542 from alalek:cl_runtime 2013-10-02 19:50:35 +04:00
Alexander Alekhin
12eb340a4e removed invalid comment 2013-10-02 19:35:21 +04:00
Andrey Pavlenko
b396916cdb Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm 2013-10-02 19:14:16 +04:00
Andrey Pavlenko
b2fe053f4d Merge pull request #1548 from ilya-lavrenov:ocl_bitwise_not 2013-10-02 19:14:00 +04:00
Alexander Alekhin
5ab49c4cc2 ocl: cl_runtime: added autogenerated code 2013-10-02 18:32:33 +04:00
Alexander Alekhin
212ad97100 ocl: dynamic load of OpenCL libraries 
Support functions from OpenCL 1.1 / OpenCL 1.2
 2013-10-02 18:32:33 +04:00
Ilya Lavrenov
e8b93040d6 enabled ocl::norm perf test 2013-10-02 16:57:15 +04:00
Roman Donchenko
d019344c9d Merge pull request #1547 from SpecLad:gtest-1.7 2013-10-02 16:46:19 +04:00
Ilya Lavrenov
a613a1a1da fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2 2013-10-02 16:09:29 +04:00
Roman Donchenko
e65eb4e042 Updated Google Test to 1.7.0. 2013-10-02 14:41:00 +04:00
Andrey Pavlenko
75d89f4331 Merge pull request #1533 from alalek:perf_test_update_relative_error_message 2013-10-01 20:17:52 +04:00
Andrey Pavlenko
154fe4f657 Merge pull request #1519 from ilya-lavrenov:ocl_minMax 2013-10-01 20:16:48 +04:00
Ilya Lavrenov
4322c47bb2 removed test_norm.cpp from ocl tests 2013-10-01 17:53:14 +04:00
Alexander Alekhin
a8ac3ec72a ocl: perf test: disable MOG2 (random hungs), enable upload/download 2013-10-01 16:49:11 +04:00
Alexander Alekhin
66e4aead97 perf tests: added SANITY_CHECK_NOTHING() 2013-10-01 16:49:11 +04:00
Ilya Lavrenov
065b40c6c3 fixed and extended ocl::norm 2013-10-01 13:21:43 +04:00
Alexander Alekhin
958604a68e perf test: update error message about relative error 2013-09-30 20:11:39 +04:00
Roman Donchenko
e35bc11504 Merge pull request #1457 from pengx17:2.4_oclsvm 2013-09-30 17:50:29 +04:00
Ilya Lavrenov
a562b5c985 fixed ocl::meanStddev and created accuracy test for this function 2013-09-30 17:37:19 +04:00
Roman Donchenko
54c902dccd Merge pull request #1509 from perping:2.4_docs 2013-09-30 17:37:19 +04:00
Ilya Lavrenov
7379152afb fixed ocl::setIdentity 2013-09-30 16:54:09 +04:00
Ilya Lavrenov
7edcefb2be fixed ocl::phase 2013-09-30 16:02:14 +04:00
Ilya Lavrenov
b864f48274 fixed ocl::sum, ocl::sqrSum, ocl::absSum 2013-09-30 15:12:38 +04:00
StevenPuttemans
f6c802b563 Applied fix suggested in bug 3282 and shortened code 2013-09-30 11:48:01 +02:00
peng xiao
315c054379 Fix new blank line at EOF. 2013-09-30 16:20:43 +08:00
peng xiao
422396ef6a fix build error 2013-09-30 16:17:20 +08:00
peng xiao
f69ccfa43d Add opencl svm. 2013-09-30 16:17:19 +08:00
Ilya Lavrenov
b54228fb83 fixed ocl::countNonZero 2013-09-27 17:35:06 +04:00
Ilya Lavrenov
9dca7555b4 fixed ocl::minMax 2013-09-27 16:25:10 +04:00
Alexander Smorkalov
8cb0921252 pr #1464 reverted as breaking the build for Linux without libv4l library. 2013-09-27 12:17:55 +04:00
perping
1bc20ae6f8 fix warning about addWeighted and remove magnitudeSqr(). 2013-09-27 09:50:37 +08:00
Andrey Pavlenko
0a695eb314 hortening the file names (HighDynamicRange -> HDR) 2013-09-26 17:06:06 +04:00
Andrey Pavlenko
3e91350a31 Merge pull request #1503 from ilya-lavrenov:ocl_arithm 2013-09-26 15:50:54 +04:00
Alexander Smorkalov
26a1a93295 Merge pull request #1464 from StevenPuttemans:bugfix_3186_second 2013-09-26 12:16:02 +04:00
perping
074f9e33cb fix three warning about mog, mog2 and KNearestNeighbour. 2013-09-26 15:30:44 +08:00
perping
f65286d3c6 Update the OpenCL documents. 2013-09-26 14:04:11 +08:00
peng xiao
28ac23c1a1 If device does not support double, returns immediately. 
Double floating points are not default supported by OpenCL.
 2013-09-26 12:59:21 +08:00
Ilya Lavrenov
f5af3ab851 changes in OpenCL matrix operations docs 2013-09-25 19:47:15 +04:00
Ilya Lavrenov
c8821bd909 replaced manually new/delete by AutoBuffer 2013-09-25 15:28:12 +04:00
Ilya Lavrenov
0faac595a8 fixed minMaxLoc kernel (removed compilation errors) 2013-09-25 15:14:10 +04:00
Ilya Lavrenov
544c02407e reverted and generalized original ocl::transpose 2013-09-25 14:22:37 +04:00
Jin Ma
c7c0a41e17 Resolved the bug that the work group size is not valid. 2013-09-25 17:42:56 +08:00
Alexander Smorkalov
6057414a93 Merge pull request #1199 from devernay:2.4-qtkit 2013-09-24 15:36:16 +04:00
Ilya Lavrenov
c87d2d414d removed arithm_absdiff.cl 2013-09-24 14:18:42 +04:00
Ilya Lavrenov
8aa3eb817d refactored arithm.cpp. Extended param list for all the tests 2013-09-24 14:13:10 +04:00
Ilya Lavrenov
b4ad128218 refactoed and extended ocl::transpose 2013-09-24 14:07:54 +04:00
Ilya Lavrenov
799afab23b refactored and extended ocl::exp and ocl::log 2013-09-24 14:02:01 +04:00
Ilya Lavrenov
0730963576 refactored and extended ocl::compare 2013-09-24 13:58:18 +04:00
Ilya Lavrenov
8e0e352d77 refactored and extended binary bitwise operations 2013-09-24 13:54:46 +04:00
Ilya Lavrenov
161674bff2 refactored and extended ocl::addWeighted 2013-09-24 13:51:37 +04:00
Ilya Lavrenov
b20bd470fe refactored and extended ocl::LUT 2013-09-24 13:49:38 +04:00
Ilya Lavrenov
311a7233c2 removed comments from filtering.cpp and imgproc.cpp in ocl module 2013-09-24 13:46:08 +04:00
Ilya Lavrenov
bd36e556a1 removed ocl::magnitudeSqr 2013-09-24 13:39:07 +04:00
Ilya Lavrenov
0ad03162df refactored and extended arithm operations add/sub/mul/div/absdiff 2013-09-24 13:34:55 +04:00
Ilya Lavrenov
5ff5fdd73d marked some methods of ocl::Context as const 2013-09-24 13:17:09 +04:00
Ilya Lavrenov
d64fb235f7 removed needless arithm_2_mat.cl file 2013-09-24 13:15:05 +04:00
StevenPuttemans
1b1fb131b3 Attempt at fixing bug 3186 2013-09-23 16:51:02 +02:00
Alexander Smorkalov
d6d8e96003 Merge pull request #1489 from melody-rain:2_4_knearest_neighbor 2013-09-23 13:34:39 +04:00
Alexander Smorkalov
0cd3d1f4d6 Merge pull request #1482 from ilya-lavrenov:ocl_setTO 2013-09-23 12:56:20 +04:00
Jin Ma
b88f5302e2 Removed unused constructor. 2013-09-23 15:10:00 +08:00
Jin Ma
1bfe39f485 Added knearest neighbor of OpenCL version. 
It includes the accuracy/performance test and the implementation of KNN.
 2013-09-22 10:23:54 +08:00
Jin Ma
06c33df307 Added knearest neighbor of OpenCL version. 
It includes the accuracy/performance test and the implementation of KNN.
 2013-09-22 10:22:09 +08:00
Csaba Kertesz
6fb3b4f41c Fix a memory leak in CvNormalBayesClassifier::train() 2013-09-20 22:36:49 +02:00
Ilya Lavrenov
362a67a695 fixed ocl::oclMat::setTo for 2-channel images 2013-09-20 15:57:38 +04:00
Alexander Alekhin
f1b5cbc8fe ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp 2013-09-18 01:14:41 +04:00
Alexander Smorkalov
6fae07ba88 Merge pull request #1460 from ilya-lavrenov:ocl_divUp 2013-09-17 15:37:44 +04:00
Alexander Smorkalov
14951dc387 Merge pull request #1461 from ilya-lavrenov:ocl_dataOperations 2013-09-17 15:21:34 +04:00
Alexander Smorkalov
d437183388 Merge pull request #1439 from ilya-lavrenov:convertTo 2013-09-17 15:12:02 +04:00
Alexander Smorkalov
9cf301e257 Merge pull request #1449 from SpecLad:dc1394-095 2013-09-17 14:36:30 +04:00
Alexander Smorkalov
8853d19e74 Merge pull request #1452 from alalek:fix_cv_export_templates 2013-09-17 14:35:40 +04:00
Andrey Pavlenko
b3bb42773b Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp 2013-09-17 14:03:40 +04:00
Alexander Smorkalov
2dceb68a21 Merge pull request #1455 from ilya-lavrenov:ocl_test_output 2013-09-17 13:18:52 +04:00
Ilya Lavrenov
6a26c4483f added performance tests for data transfer operations 2013-09-16 23:51:36 +04:00
Ilya Lavrenov
58b84c2fc0 removed needless divUp 2013-09-16 15:48:30 +04:00
Alexander Smorkalov
06a7a1ac47 Bug #1890 Opencv 2.4.0 with QT 4.7.4 and cvcreatebutton exception fixed. 
QVector range check exception fixed.
 2013-09-16 13:42:15 +04:00
Ilya Lavrenov
e0325fe057 removed useless output 2013-09-15 22:04:22 +04:00
Ilya Lavrenov
a5c9d83617 fixed ocl::pyrUp for 2-byte types 2013-09-15 19:56:05 +04:00
Alexander Alekhin
0ee47502d9 remove CV_EXPORT from templates 2013-09-15 13:48:54 +04:00
Roman Donchenko
671e5e39b1 Dropped the HAVE_DC1394_095 configuration macro. 
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.

Note that 1.0 doesn't have the do_extra_buffering parameter.
 2013-09-13 17:25:21 +04:00
Ilya Lavrenov
9311f84109 disabled MOG tests if no video input support 2013-09-13 12:47:25 +04:00
Roman Donchenko
e3710488a8 Merge pull request #1434 from melody-rain:Added_perf_kalman_cpp 2013-09-12 16:54:21 +04:00
Roman Donchenko
dee2a65978 Merge pull request #1440 from SpecLad:wcast-align 2013-09-12 13:56:23 +04:00
Roman Donchenko
ad52dd37a9 Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186" 
This reverts commit 41b8479d03, reversing
changes made to 531471b0aa.

Reason: breaks the build.
 2013-09-12 12:58:10 +04:00
Roman Donchenko
ac9bc6423a Merge pull request #1428 from ilya-lavrenov:ocl_pyr 2013-09-12 12:48:45 +04:00
Ilya Lavrenov
f20cc2bce8 extended ocl::convertTo 2013-09-12 12:39:03 +04:00
Roman Donchenko
fec697b390 Silenced a few -Wcast-align warnings in the headers. 
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
 2013-09-12 12:33:56 +04:00
Roman Donchenko
f31d06f980 Merge pull request #1418 from vpisarev:24_ipp_sepfilter_dft 2013-09-12 12:19:37 +04:00
Jin Ma
f4d0c9b13c Revised the code according to the feedback of the community. 2013-09-12 09:43:30 +08:00
Roman Donchenko
caf9fdbdc3 Merge pull request #1432 from SpecLad:unseq 2013-09-11 13:50:36 +04:00
Roman Donchenko
6fcd9e3830 Merge pull request #1431 from asmorkalov:android_recording_hint 2013-09-11 13:50:03 +04:00
Jin Ma
b9d7e67589 Removed whitespace. 2013-09-11 11:28:36 +08:00
Jin Ma
2e0f613c38 Added performance for Kalman Filter. 2013-09-11 10:19:02 +08:00
Roman Donchenko
6a21eca7e7 Merge pull request #1421 from ilya-lavrenov:ocl_bilateral 2013-09-10 18:59:41 +04:00
Alexander Smorkalov
98cb1dcc9a MediaRecorder hint enabled for all Android devices with API level 14 and above. 
It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.
 2013-09-10 18:05:45 +04:00
Roman Donchenko
51ed1873de Eliminated unsequenced assignments to temp3 from dpstereo.cpp. 
They're unsequenced if CV_IMIN3 or CV_IMAX3 are invoked more than once
in a single expression.
 2013-09-10 18:05:23 +04:00
Ilya Lavrenov
6b9c451938 added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown 2013-09-10 17:36:18 +04:00
Roman Donchenko
747f7178ca Merge pull request #1417 from ilya-lavrenov:merge_fix 2013-09-10 11:33:25 +04:00