Commit Graph

8792 Commits

Author SHA1 Message Date
Konstantin Matskevich
c7a6537b83 add brackets 2014-01-24 16:35:51 +04:00
Andrey Pavlenko
d093cb54d5 Merge pull request #2194 from apavlenko:2.4_perf_haar_iter 2014-01-24 16:13:19 +04:00
Konstantin Matskevich
ae827a638c fixes 2014-01-24 14:01:31 +04:00
Elena Gvozdeva
07a88d48e9 fixed 2014-01-24 11:41:23 +04:00
Andrey Pavlenko
0a4a1d7526 temporary disabling hanging test 2014-01-24 10:07:21 +04:00
Elena Gvozdeva
4d86804f11 Fixed merge conflicts 2014-01-23 15:31:32 +04:00
Elena Gvozdeva
7bd8f9294d fixed 2014-01-23 14:50:30 +04:00
Elena Gvozdeva
8c5e19c270 fixed pref test 2014-01-23 14:50:29 +04:00
Elena Gvozdeva
b4652e2cb3 Added perf test for ocl_matchTemplate 2014-01-23 14:50:29 +04:00
Elena Gvozdeva
2c0765b4d1 fixed trailing whitespace 2014-01-23 14:50:29 +04:00
Elena Gvozdeva
7e2bdb590f fixed 2014-01-23 14:50:29 +04:00
Elena Gvozdeva
4da1ba56b3 fixed 2014-01-23 14:50:29 +04:00
Elena Gvozdeva
47b572f99f fixed 2014-01-23 14:50:28 +04:00
Elena Gvozdeva
da4d33ec26 Fixed test_match_template 2014-01-23 14:50:28 +04:00
Elena Gvozdeva
9de70c9a00 Fixed trailing whitespace 2014-01-23 14:50:28 +04:00
Elena Gvozdeva
ba5d480f80 Fixed warnings 2014-01-23 14:50:28 +04:00
Elena Gvozdeva
86636dc265 Added ocl_matchTemplate( without dft) 2014-01-23 14:50:28 +04:00
Andrey Pavlenko
ee88cc2c52 Merge pull request #2110 from hmax:master 2014-01-23 14:37:34 +04:00
Roman Donchenko
7ff9d7eb2d Merge pull request #2188 from jet47:gpumat-copyto-fix 2014-01-23 13:28:12 +04:00
Konstantin Matskevich
133f91f3f2 added perf test 2014-01-23 07:51:19 +04:00
Andrey Pavlenko
ba77719914 Merge pull request #2189 from ilya-lavrenov:tapi_sepFilter2D_fix 2014-01-22 19:13:05 +04:00
Andrey Pavlenko
7ce6c28bb4 Merge pull request #2186 from ilya-lavrenov:tapi_precornerdetect 2014-01-22 19:09:34 +04:00
Andrey Pavlenko
9aa4410509 Merge pull request #2134 from vbystricky:ocl_calcOpticalFlowFarneback 2014-01-22 18:57:34 +04:00
Konstantin Matskevich
f90e41d54e dumpinfo 2014-01-22 17:04:44 +04:00
Konstantin Matskevich
2f8c29a1f0 removed unnecessary functions and variables 2014-01-22 15:31:27 +04:00
Konstantin Matskevich
3b7683e72f fixed docs 2014-01-22 15:31:26 +04:00
Konstantin Matskevich
ca5689e0db BFMatcher
match

radiusMatch
2014-01-22 15:31:26 +04:00
Ilya Lavrenov
d2ffd8ed21 implemented OpenCL version of cv::preCornerDetect 2014-01-22 13:46:26 +04:00
Ilya Lavrenov
059e6e4305 fixed cv::sepFilter2D 2014-01-22 13:40:48 +04:00
Vladislav Vinogradov
dda999545c fix GpuMat::copyTo method with mask:
fill destination matrix with zeros if it was reallocated
2014-01-22 10:40:14 +04:00
vbystricky
e0c6377d58 Change the sanity checking type to ERROR_RELATIVE 2014-01-22 10:34:27 +04:00
Andrey Pavlenko
069bb9a929 Merge pull request #2185 from ilya-lavrenov:tapi_corners 2014-01-22 10:25:41 +04:00
Andrey Pavlenko
665d9cb29c Merge pull request #2168 from ilya-lavrenov:tapi_perf_stitching 2014-01-22 10:14:38 +04:00
Andrey Pavlenko
5d818c010e Merge pull request #2156 from ilya-lavrenov:tapi_reduce 2014-01-22 10:12:08 +04:00
Andrey Pavlenko
1400f53436 Merge pull request #2184 from ilya-lavrenov:bioinspired2contrib 2014-01-21 23:27:16 +04:00
Andrey Pavlenko
99942e8043 Merge pull request #2166 from ilya-lavrenov:tapi_gftt 2014-01-21 22:29:41 +04:00
Alexander Smorkalov
b75cbfde45 All installed files marked with component names for install customization. 2014-01-21 20:34:36 +04:00
Ilya Lavrenov
3177a683e9 ported corners to T-API 2014-01-21 20:13:55 +04:00
Roman Donchenko
a548a08129 Merge pull request #2183 from jet47:cuda-hough-fix 2014-01-21 19:27:54 +04:00
Andrey Pavlenko
c8afe7efc6 Merge pull request #1320 from mbarnach:svm_hog 2014-01-21 19:23:04 +04:00
Andrey Pavlenko
4fbd2ef87a Merge pull request #1290 from mbarnach:bow_desc 2014-01-21 19:22:47 +04:00
Andrey Pavlenko
32bc89f094 Merge pull request #2107 from nghiaho12:nn_doc 2014-01-21 19:11:12 +04:00
vbystricky
c1172b83dd Change epsilon value to 0.01 2014-01-21 18:46:26 +04:00
Ilya Lavrenov
5d206059a8 moved bioinspired to opencv_contrib 2014-01-21 18:02:53 +04:00
Andrey Pavlenko
9eca3ec8f6 Merge pull request #2177 from ilya-lavrenov:ocl_superres 2014-01-21 17:05:50 +04:00
Vladislav Vinogradov
33d42b740c disable CUDA generalized Hough Transform 2014-01-21 15:07:47 +04:00
Vladislav Vinogradov
d847387694 split CUDA Hough sources 2014-01-21 15:07:47 +04:00
Ilya Lavrenov
bfa382cf9d fixed copying UMat -> std::vector 2014-01-21 14:37:22 +04:00
Ilya Lavrenov
ae4be413c3 added perf tests for cv::reduce 2014-01-21 14:18:38 +04:00
Ilya Lavrenov
ac2e613975 skip OCL tests if OpenCL isn't available 2014-01-21 13:09:39 +04:00
Andrey Pavlenko
494f7e3657 Merge pull request #2158 from KonstantinMatskevich:testdata_path_calib3d 2014-01-20 23:35:06 +04:00
Andrey Pavlenko
801d2d0a32 Merge pull request #2167 from ilya-lavrenov:tapi_kern_warn 2014-01-20 23:33:55 +04:00
Roman Donchenko
a509819b21 Merge pull request #2163 from ilya-lavrenov:tapi_channels 2014-01-20 18:48:52 +04:00
Ilya Lavrenov
e5130cf83f enabled tests 2014-01-20 18:09:43 +04:00
Roman Donchenko
9710b25c7d Merge pull request #2173 from Nerei:viz 2014-01-20 18:05:11 +04:00
Roman Donchenko
9dc93ce328 Merge pull request #2176 from SpecLad:merge-2.4 2014-01-20 18:04:56 +04:00
Anatoly Baksheev
ac035b9b8e review comments 2014-01-20 15:22:58 +04:00
Andrey Pavlenko
69ba0c53ad Merge pull request #2165 from ilya-lavrenov:tapi_upload 2014-01-20 15:18:56 +04:00
Roman Donchenko
e45fd939c2 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
	modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
	modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
	modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
2014-01-20 15:10:19 +04:00
Roman Donchenko
087371c021 Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2 2014-01-20 14:15:05 +04:00
Ilya Lavrenov
5abfd40989 added perf test for cv::goodFeaturesToTrack 2014-01-20 13:57:53 +04:00
Ilya Lavrenov
52ed6d0d27 ported cv::goodFeaturesToTrack to T-API 2014-01-20 13:57:53 +04:00
Ilya Lavrenov
5d18cf9989 added cv::[extract|insert]Channel to T-API 2014-01-20 13:52:07 +04:00
Roman Donchenko
8386ce2b2f Merge pull request #2160 from SpecLad:norm-assert 2014-01-20 12:20:21 +04:00
Anatoly Baksheev
4cc8f7012b closing window 2014-01-19 18:39:01 +04:00
Anatoly Baksheev
4e18007066 fixed white spaces 2014-01-19 18:39:01 +04:00
Anatoly Baksheev
d29c3d2f0d fixed documentation warnings 2014-01-19 18:39:00 +04:00
Anatoly Baksheev
8f15a8abdb disabled Ubuntu workaround code for Windows 2014-01-19 18:39:00 +04:00
Anatoly Baksheev
0d12fb0346 implemented workaround of a problem with x-server for ubuntu 2014-01-19 18:39:00 +04:00
Anatoly Baksheev
7410593d55 fixed warnigns and compiler errors for Ubuntu 2014-01-19 18:39:00 +04:00
Anatoly Baksheev
d7ca0bb757 merged background color with background gradient methods, updated tests to show description of scene 2014-01-19 18:38:59 +04:00
Anatoly Baksheev
16281027af resolved problem with multiple spin()/spinOnce() 2014-01-19 18:38:59 +04:00
Anatoly Baksheev
57d5ad5131 minor iteractor refactoring 2014-01-19 18:38:59 +04:00
Anatoly Baksheev
ffad7b699c added test for textured mesh 2014-01-19 18:38:59 +04:00
Anatoly Baksheev
8d327fa497 updated for compatibility with VTK6.0 2014-01-19 18:38:58 +04:00
Anatoly Baksheev
e472d45d99 updated mesh reading (texture support) 2014-01-19 18:38:58 +04:00
Anatoly Baksheev
625c35a9f9 added support of texture for mesh 2014-01-19 18:38:58 +04:00
Anatoly Baksheev
74206e0159 added painted cloud widget 2014-01-19 18:38:57 +04:00
Anatoly Baksheev
3086095837 improved background gradient 2014-01-19 18:38:57 +04:00
Anatoly Baksheev
b0ca93b22c by default enabled tests vtk 2014-01-19 18:38:57 +04:00
Anatoly Baksheev
d7c30281a5 set background texture method 2014-01-19 18:38:57 +04:00
Anatoly Baksheev
e2ef558c8a refactored WGrid 2014-01-19 18:38:56 +04:00
Anatoly Baksheev
658f4a7d38 refactoed plane 2014-01-19 18:38:56 +04:00
Anatoly Baksheev
53b8218652 addeed test for text 2d/3d 2014-01-19 18:38:56 +04:00
Anatoly Baksheev
bb891f0570 added cone implementation 2014-01-19 18:38:56 +04:00
Anatoly Baksheev
08f50314cb updated cylinder and cube 2014-01-19 18:38:55 +04:00
Anatoly Baksheev
c0cc551228 refactored circle 2014-01-19 18:38:55 +04:00
Anatoly Baksheev
dac27c9913 refactored arrow 2014-01-19 18:38:55 +04:00
Anatoly Baksheev
1449823bcd implemented showImage 2014-01-19 18:38:55 +04:00
Anatoly Baksheev
d90a068e0e fixed bug with setImage 2014-01-19 18:38:54 +04:00
Anatoly Baksheev
cad9a786c4 optimized Mat to vtkImageData conversion 2014-01-19 18:38:54 +04:00
Anatoly Baksheev
e21f2a81ff factored camera postions with image 2014-01-19 18:38:54 +04:00
Anatoly Baksheev
a23f1447a8 minor 2014-01-19 18:38:53 +04:00
Anatoly Baksheev
f930f2f19d simplification of cloud collection 2014-01-19 18:38:53 +04:00
Anatoly Baksheev
e3ff28dacc refactored WImage3D 2014-01-19 18:38:53 +04:00
Anatoly Baksheev
f37c31742a created tests for images, created vtk/vtkImageMatSource, and switched all images to that class 2014-01-19 18:38:53 +04:00
Anatoly Baksheev
462d516743 added test for camera positions, slightly refactored the widgets 2014-01-19 18:38:52 +04:00
Anatoly Baksheev
8309d19f31 renamed Mesh3d -> Mesh 2014-01-19 18:38:52 +04:00
Anatoly Baksheev
d591bd875b fixed crash in enabling shading for polydata widgets 2014-01-19 18:38:52 +04:00
Anatoly Baksheev
e478d6b1e9 renamed cv::viz::get() to getWindowByName() 2014-01-19 18:38:52 +04:00
Anatoly Baksheev
25b417e8b2 added test for trajectories and fixed bug with float type 2014-01-19 18:38:51 +04:00
Anatoly Baksheev
64566e6178 minor 2014-01-19 18:38:51 +04:00
Anatoly Baksheev
0d702b83f4 updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts 2014-01-19 18:38:51 +04:00
Anatoly Baksheev
a3b1f29d23 refactored spheres trajectory 2014-01-19 18:38:51 +04:00
Anatoly Baksheev
38c9fa4a92 more refactoring 2014-01-19 18:38:50 +04:00
Anatoly Baksheev
4833976a0c refactored frustum trajectory to use glyphs 2014-01-19 18:38:50 +04:00
Anatoly Baksheev
42dc90295d refactored camera position - simplified frustum creation 2014-01-19 18:38:50 +04:00
Anatoly Baksheev
45879fb9db more refactoring 2014-01-19 18:38:50 +04:00
Anatoly Baksheev
a8556134ae refactored simple trajectory to use TensorGlyph 2014-01-19 18:38:49 +04:00
Anatoly Baksheev
771d9509a8 polyline now uses scalars for color data (for reuse by other widgets) 2014-01-19 18:38:49 +04:00
Anatoly Baksheev
e94ee94be3 refactored WCoordinateSystem widget 2014-01-19 18:38:49 +04:00
Anatoly Baksheev
56819eaf19 switched completer API to doubles, updated docs 2014-01-19 18:38:48 +04:00
Anatoly Baksheev
d264465422 more refactoring 2014-01-19 18:38:48 +04:00
Anatoly Baksheev
406444037d refactored polyline 2014-01-19 18:38:48 +04:00
Anatoly Baksheev
b100299644 code beatification 2014-01-19 18:38:48 +04:00
Anatoly Baksheev
e26b7e1e4f ported some trajectories functionality to InputArray style 2014-01-19 18:38:47 +04:00
Anatoly Baksheev
7b28f730f4 traits for Affine3 2014-01-19 18:38:47 +04:00
Anatoly Baksheev
cd57c4e189 refactored CloudNormals and added test for it 2014-01-19 18:38:47 +04:00
Anatoly Baksheev
b7cb3fe8e0 switched more to doubles 2014-01-19 18:38:47 +04:00
Anatoly Baksheev
a76a34d28e added Affine3: 3x4 input Mat support 2014-01-19 18:38:46 +04:00
Anatoly Baksheev
3e071491c9 added Affine3 ctor from array 2014-01-19 18:38:46 +04:00
Anatoly Baksheev
baee8c3aa5 refactored Mesh, added tests, added failing "twice spin()" test 2014-01-19 18:38:46 +04:00
Anatoly Baksheev
70a81db567 fixed bugs in cloud collection and added test 2014-01-19 18:38:46 +04:00
Anatoly Baksheev
cb58061649 getViewerPose implementation simplified (and error seems to be fixed) 2014-01-19 18:38:45 +04:00
Anatoly Baksheev
186853a50f mass switch from Affine3f to Affine3d 2014-01-19 18:38:45 +04:00
Anatoly Baksheev
b1c0bf1fee Affine::rotate(rvec) method 2014-01-19 18:38:45 +04:00
Anatoly Baksheev
1615527426 switched source to InputArrays 2014-01-19 18:38:45 +04:00
Anatoly Baksheev
f610c295f2 more tests 2014-01-19 18:38:44 +04:00
Anatoly Baksheev
e7791e1590 colors minor 2014-01-19 18:38:44 +04:00
Anatoly Baksheev
c1b41caa7c added vtkCloudMatSink, reworked cloud IO functions, added normals support 2014-01-19 18:38:44 +04:00
Anatoly Baksheev
1c4cfd8eaf normals support for CloudMatSource 2014-01-19 18:38:43 +04:00
Anatoly Baksheev
7e952e2f10 removed incorrect and unnecessarily methods from Affine3f 2014-01-19 18:38:43 +04:00
Anatoly Baksheev
bf30c33e6e getting data from opencv_extra 2014-01-19 18:38:43 +04:00
Anatoly Baksheev
b131faa8f9 export scene to vrml and obj formats 2014-01-19 18:38:43 +04:00
Anatoly Baksheev
b2cd526e6a removed extra code 2014-01-19 18:38:42 +04:00
Anatoly Baksheev
84d6fe397d reading/writing clouds functionality 2014-01-19 18:38:42 +04:00
Anatoly Baksheev
80ab6e889f refactoring 2014-01-19 18:38:42 +04:00
Anatoly Baksheev
7dbf6bc8df rewrote cloud widget in vtk filters style
Conflicts:
	modules/viz/src/clouds.cpp
2014-01-19 18:38:42 +04:00
Anatoly Baksheev
159de9cc47 fixed potential crash 2014-01-19 18:38:41 +04:00
Anatoly Baksheev
2705068290 refactored Keyboard and Mouse Events 2014-01-19 18:38:41 +04:00
Anatoly Baksheev
cad2f98007 removed vizActor (since unnecessarily in new design concept with simplified widgets) 2014-01-19 18:38:41 +04:00
Anatoly Baksheev
45aeecb043 renaming 2014-01-19 18:38:41 +04:00
Anatoly Baksheev
abc9465798 kinect camera CAD parameters 2014-01-19 18:38:40 +04:00
Anatoly Baksheev
e990d5b999 reading/writing trajectories 2014-01-19 18:38:40 +04:00
Anatoly Baksheev
e048df51ce for shapes switched vtkDataSetMapper to more efficient vtkPolyDataMapper 2014-01-19 18:38:40 +04:00
Anatoly Baksheev
4979f44cfa minor 2014-01-19 18:38:40 +04:00
Anatoly Baksheev
31d42ce18f refactored Trajectory: split into Trajectory and TrajectoryFrustums) 2014-01-19 18:38:39 +04:00
Anatoly Baksheev
54fa69cab2 renamed Spheres Trajectory, minor changes in Trajectory 2014-01-19 18:38:39 +04:00
Anatoly Baksheev
c7ff13873d minor 2014-01-19 18:38:39 +04:00
Anatoly Baksheev
f6e9b81188 reduced exported interface names (to make IntelliSense hints less littered) 2014-01-19 18:38:38 +04:00