platform/upstream/opencv.git
10 years agoMerge pull request #2156 from ilya-lavrenov:tapi_reduce
Andrey Pavlenko [Wed, 22 Jan 2014 06:12:07 +0000 (10:12 +0400)]
Merge pull request #2156 from ilya-lavrenov:tapi_reduce

10 years agoMerge pull request #2184 from ilya-lavrenov:bioinspired2contrib
Andrey Pavlenko [Tue, 21 Jan 2014 19:27:15 +0000 (23:27 +0400)]
Merge pull request #2184 from ilya-lavrenov:bioinspired2contrib

10 years agoMerge pull request #2166 from ilya-lavrenov:tapi_gftt
Andrey Pavlenko [Tue, 21 Jan 2014 18:29:41 +0000 (22:29 +0400)]
Merge pull request #2166 from ilya-lavrenov:tapi_gftt

10 years agoMerge pull request #1320 from mbarnach:svm_hog
Andrey Pavlenko [Tue, 21 Jan 2014 15:23:04 +0000 (19:23 +0400)]
Merge pull request #1320 from mbarnach:svm_hog

10 years agoMerge pull request #1290 from mbarnach:bow_desc
Andrey Pavlenko [Tue, 21 Jan 2014 15:22:46 +0000 (19:22 +0400)]
Merge pull request #1290 from mbarnach:bow_desc

10 years agoremoved TOC
Ilya Lavrenov [Tue, 21 Jan 2014 14:47:22 +0000 (18:47 +0400)]
removed TOC

10 years agomoved bioinspired to opencv_contrib
Ilya Lavrenov [Tue, 21 Jan 2014 14:02:53 +0000 (18:02 +0400)]
moved bioinspired to opencv_contrib

10 years agoMerge pull request #2177 from ilya-lavrenov:ocl_superres
Andrey Pavlenko [Tue, 21 Jan 2014 13:05:50 +0000 (17:05 +0400)]
Merge pull request #2177 from ilya-lavrenov:ocl_superres

10 years agofixed copying UMat -> std::vector
Ilya Lavrenov [Mon, 20 Jan 2014 12:46:20 +0000 (16:46 +0400)]
fixed copying UMat -> std::vector

10 years agoadded perf tests for cv::reduce
Ilya Lavrenov [Thu, 16 Jan 2014 21:05:59 +0000 (01:05 +0400)]
added perf tests for cv::reduce

10 years agoskip OCL tests if OpenCL isn't available
Ilya Lavrenov [Mon, 20 Jan 2014 13:52:32 +0000 (17:52 +0400)]
skip OCL tests if OpenCL isn't available

10 years agoMerge pull request #2158 from KonstantinMatskevich:testdata_path_calib3d
Andrey Pavlenko [Mon, 20 Jan 2014 19:35:06 +0000 (23:35 +0400)]
Merge pull request #2158 from KonstantinMatskevich:testdata_path_calib3d

10 years agoMerge pull request #2167 from ilya-lavrenov:tapi_kern_warn
Andrey Pavlenko [Mon, 20 Jan 2014 19:33:55 +0000 (23:33 +0400)]
Merge pull request #2167 from ilya-lavrenov:tapi_kern_warn

10 years agoMerge pull request #2163 from ilya-lavrenov:tapi_channels
Roman Donchenko [Mon, 20 Jan 2014 14:48:52 +0000 (18:48 +0400)]
Merge pull request #2163 from ilya-lavrenov:tapi_channels

10 years agoMerge pull request #2173 from Nerei:viz
Roman Donchenko [Mon, 20 Jan 2014 14:05:11 +0000 (18:05 +0400)]
Merge pull request #2173 from Nerei:viz

10 years agoMerge pull request #2176 from SpecLad:merge-2.4
Roman Donchenko [Mon, 20 Jan 2014 14:04:55 +0000 (18:04 +0400)]
Merge pull request #2176 from SpecLad:merge-2.4

10 years agoreview comments
Anatoly Baksheev [Mon, 20 Jan 2014 11:17:35 +0000 (15:17 +0400)]
review comments

10 years agoMerge pull request #2165 from ilya-lavrenov:tapi_upload
Andrey Pavlenko [Mon, 20 Jan 2014 11:18:55 +0000 (15:18 +0400)]
Merge pull request #2165 from ilya-lavrenov:tapi_upload

10 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Mon, 20 Jan 2014 11:10:19 +0000 (15:10 +0400)]
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

10 years agoMerge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2
Roman Donchenko [Mon, 20 Jan 2014 10:15:04 +0000 (14:15 +0400)]
Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2

10 years agoadded perf test for cv::goodFeaturesToTrack
Ilya Lavrenov [Sat, 18 Jan 2014 17:13:50 +0000 (21:13 +0400)]
added perf test for cv::goodFeaturesToTrack

10 years agoported cv::goodFeaturesToTrack to T-API
Ilya Lavrenov [Fri, 17 Jan 2014 15:00:52 +0000 (19:00 +0400)]
ported cv::goodFeaturesToTrack to T-API

10 years agoadded cv::[extract|insert]Channel to T-API
Ilya Lavrenov [Fri, 17 Jan 2014 19:31:03 +0000 (23:31 +0400)]
added cv::[extract|insert]Channel to T-API

10 years agoMerge pull request #2160 from SpecLad:norm-assert
Roman Donchenko [Mon, 20 Jan 2014 08:20:21 +0000 (12:20 +0400)]
Merge pull request #2160 from SpecLad:norm-assert

10 years agoMerge pull request #2174 from Nerei:yet_another_fix_for_pr2172
Roman Donchenko [Mon, 20 Jan 2014 08:06:43 +0000 (12:06 +0400)]
Merge pull request #2174 from Nerei:yet_another_fix_for_pr2172

10 years agoclosing window
Anatoly Baksheev [Sun, 19 Jan 2014 04:47:07 +0000 (08:47 +0400)]
closing window

10 years agofixed white spaces
Anatoly Baksheev [Sat, 18 Jan 2014 23:22:45 +0000 (03:22 +0400)]
fixed white spaces

10 years agofixed documentation warnings
Anatoly Baksheev [Sat, 18 Jan 2014 23:03:05 +0000 (03:03 +0400)]
fixed documentation warnings

10 years agodisabled Ubuntu workaround code for Windows
Anatoly Baksheev [Sat, 18 Jan 2014 22:16:59 +0000 (02:16 +0400)]
disabled Ubuntu workaround code for Windows

10 years agoimplemented workaround of a problem with x-server for ubuntu
Anatoly Baksheev [Sat, 18 Jan 2014 21:55:40 +0000 (01:55 +0400)]
implemented workaround of a problem with x-server for ubuntu

10 years agofixed warnigns and compiler errors for Ubuntu
Anatoly Baksheev [Sat, 18 Jan 2014 20:13:47 +0000 (00:13 +0400)]
fixed warnigns and compiler errors for Ubuntu

10 years agomerged background color with background gradient methods, updated tests to show descr...
Anatoly Baksheev [Sat, 18 Jan 2014 18:25:40 +0000 (22:25 +0400)]
merged background color with background gradient methods, updated tests to show description of scene

10 years agoresolved problem with multiple spin()/spinOnce()
Anatoly Baksheev [Sat, 18 Jan 2014 17:43:10 +0000 (21:43 +0400)]
resolved problem with multiple spin()/spinOnce()

10 years agominor iteractor refactoring
Anatoly Baksheev [Sat, 18 Jan 2014 13:19:17 +0000 (17:19 +0400)]
minor iteractor refactoring

10 years agoadded test for textured mesh
Anatoly Baksheev [Mon, 13 Jan 2014 21:01:51 +0000 (01:01 +0400)]
added test for textured mesh

10 years agoupdated for compatibility with VTK6.0
Anatoly Baksheev [Mon, 13 Jan 2014 18:42:49 +0000 (22:42 +0400)]
updated for compatibility with VTK6.0

10 years agoupdated mesh reading (texture support)
Anatoly Baksheev [Mon, 13 Jan 2014 09:30:34 +0000 (13:30 +0400)]
updated mesh reading (texture support)

10 years agoadded support of texture for mesh
Anatoly Baksheev [Sun, 12 Jan 2014 20:46:24 +0000 (00:46 +0400)]
added support of texture for mesh

10 years agoadded painted cloud widget
Anatoly Baksheev [Sun, 12 Jan 2014 14:05:07 +0000 (18:05 +0400)]
added painted cloud widget

10 years agoimproved background gradient
Anatoly Baksheev [Sun, 12 Jan 2014 12:40:41 +0000 (16:40 +0400)]
improved background gradient

10 years agoby default enabled tests vtk
Anatoly Baksheev [Sun, 12 Jan 2014 11:56:54 +0000 (15:56 +0400)]
by default enabled tests vtk

10 years agoset background texture method
Anatoly Baksheev [Sun, 12 Jan 2014 11:46:03 +0000 (15:46 +0400)]
set background texture method

10 years agorefactored WGrid
Anatoly Baksheev [Sun, 12 Jan 2014 11:22:26 +0000 (15:22 +0400)]
refactored WGrid

10 years agorefactoed plane
Anatoly Baksheev [Sun, 12 Jan 2014 10:58:22 +0000 (14:58 +0400)]
refactoed plane

10 years agoaddeed test for text 2d/3d
Anatoly Baksheev [Sat, 11 Jan 2014 20:31:45 +0000 (00:31 +0400)]
addeed test for text 2d/3d

10 years agoadded cone implementation
Anatoly Baksheev [Sat, 11 Jan 2014 20:05:59 +0000 (00:05 +0400)]
added cone implementation

10 years agoupdated cylinder and cube
Anatoly Baksheev [Sat, 11 Jan 2014 19:40:56 +0000 (23:40 +0400)]
updated cylinder and cube

10 years agorefactored circle
Anatoly Baksheev [Sat, 11 Jan 2014 19:29:28 +0000 (23:29 +0400)]
refactored circle

10 years agorefactored arrow
Anatoly Baksheev [Sat, 11 Jan 2014 19:07:30 +0000 (23:07 +0400)]
refactored arrow

10 years agoimplemented showImage
Anatoly Baksheev [Sat, 11 Jan 2014 18:43:58 +0000 (22:43 +0400)]
implemented showImage

10 years agofixed bug with setImage
Anatoly Baksheev [Sat, 11 Jan 2014 18:13:45 +0000 (22:13 +0400)]
fixed bug with setImage

10 years agooptimized Mat to vtkImageData conversion
Anatoly Baksheev [Sat, 11 Jan 2014 18:00:28 +0000 (22:00 +0400)]
optimized Mat to vtkImageData conversion

10 years agofactored camera postions with image
Anatoly Baksheev [Sat, 11 Jan 2014 16:40:10 +0000 (20:40 +0400)]
factored camera postions with image

10 years agominor
Anatoly Baksheev [Sat, 11 Jan 2014 16:01:57 +0000 (20:01 +0400)]
minor

10 years agosimplification of cloud collection
Anatoly Baksheev [Sat, 11 Jan 2014 12:44:01 +0000 (16:44 +0400)]
simplification of cloud collection

10 years agorefactored WImage3D
Anatoly Baksheev [Fri, 10 Jan 2014 15:57:16 +0000 (19:57 +0400)]
refactored WImage3D

10 years agocreated tests for images, created vtk/vtkImageMatSource, and switched all images...
Anatoly Baksheev [Thu, 9 Jan 2014 21:57:11 +0000 (01:57 +0400)]
created tests for images, created vtk/vtkImageMatSource, and switched all images to that class

10 years agoadded test for camera positions, slightly refactored the widgets
Anatoly Baksheev [Thu, 9 Jan 2014 20:31:27 +0000 (00:31 +0400)]
added test for camera positions, slightly refactored the widgets

10 years agorenamed Mesh3d -> Mesh
Anatoly Baksheev [Thu, 9 Jan 2014 16:26:51 +0000 (20:26 +0400)]
renamed Mesh3d -> Mesh

10 years agofixed crash in enabling shading for polydata widgets
Anatoly Baksheev [Thu, 9 Jan 2014 15:34:55 +0000 (19:34 +0400)]
fixed crash in enabling shading for polydata widgets

10 years agorenamed cv::viz::get() to getWindowByName()
Anatoly Baksheev [Thu, 9 Jan 2014 15:08:06 +0000 (19:08 +0400)]
renamed cv::viz::get() to getWindowByName()

10 years agoadded test for trajectories and fixed bug with float type
Anatoly Baksheev [Wed, 8 Jan 2014 15:43:20 +0000 (19:43 +0400)]
added test for trajectories and fixed bug with float type

10 years agominor
Anatoly Baksheev [Wed, 8 Jan 2014 13:46:32 +0000 (17:46 +0400)]
minor

10 years agoupdated code to use mapper->SetInput instead of SetInputConnection. All widgets excep...
Anatoly Baksheev [Wed, 8 Jan 2014 13:16:25 +0000 (17:16 +0400)]
updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts

10 years agorefactored spheres trajectory
Anatoly Baksheev [Wed, 8 Jan 2014 12:25:14 +0000 (16:25 +0400)]
refactored spheres trajectory

10 years agomore refactoring
Anatoly Baksheev [Tue, 7 Jan 2014 18:59:40 +0000 (22:59 +0400)]
more refactoring

10 years agorefactored frustum trajectory to use glyphs
Anatoly Baksheev [Tue, 7 Jan 2014 18:35:21 +0000 (22:35 +0400)]
refactored frustum trajectory to use glyphs

10 years agorefactored camera position - simplified frustum creation
Anatoly Baksheev [Tue, 7 Jan 2014 18:21:42 +0000 (22:21 +0400)]
refactored camera position - simplified frustum creation

10 years agomore refactoring
Anatoly Baksheev [Tue, 7 Jan 2014 17:48:32 +0000 (21:48 +0400)]
more refactoring

10 years agorefactored simple trajectory to use TensorGlyph
Anatoly Baksheev [Tue, 7 Jan 2014 17:37:33 +0000 (21:37 +0400)]
refactored simple trajectory to use TensorGlyph

10 years agopolyline now uses scalars for color data (for reuse by other widgets)
Anatoly Baksheev [Tue, 7 Jan 2014 17:32:54 +0000 (21:32 +0400)]
polyline now uses scalars for color data (for reuse by other widgets)

10 years agorefactored WCoordinateSystem widget
Anatoly Baksheev [Tue, 7 Jan 2014 17:28:29 +0000 (21:28 +0400)]
refactored WCoordinateSystem widget

10 years agoswitched completer API to doubles, updated docs
Anatoly Baksheev [Tue, 7 Jan 2014 17:27:11 +0000 (21:27 +0400)]
switched completer API to doubles, updated docs

10 years agomore refactoring
Anatoly Baksheev [Tue, 7 Jan 2014 17:13:15 +0000 (21:13 +0400)]
more refactoring

10 years agorefactored polyline
Anatoly Baksheev [Tue, 7 Jan 2014 14:18:06 +0000 (18:18 +0400)]
refactored polyline

10 years agocode beatification
Anatoly Baksheev [Tue, 7 Jan 2014 10:51:32 +0000 (14:51 +0400)]
code beatification

10 years agoported some trajectories functionality to InputArray style
Anatoly Baksheev [Tue, 7 Jan 2014 08:34:42 +0000 (12:34 +0400)]
ported some trajectories functionality to InputArray style

10 years agotraits for Affine3
Anatoly Baksheev [Tue, 7 Jan 2014 08:32:33 +0000 (12:32 +0400)]
traits for Affine3

10 years agorefactored CloudNormals and added test for it
Anatoly Baksheev [Tue, 7 Jan 2014 06:53:04 +0000 (10:53 +0400)]
refactored CloudNormals and added test for it

10 years agoswitched more to doubles
Anatoly Baksheev [Thu, 2 Jan 2014 12:33:47 +0000 (16:33 +0400)]
switched more to doubles

10 years agoadded Affine3: 3x4 input Mat support
Anatoly Baksheev [Thu, 2 Jan 2014 12:16:29 +0000 (16:16 +0400)]
added Affine3: 3x4 input Mat support

10 years agoadded Affine3 ctor from array
Anatoly Baksheev [Thu, 2 Jan 2014 12:10:08 +0000 (16:10 +0400)]
added Affine3 ctor from array

10 years agorefactored Mesh, added tests, added failing "twice spin()" test
Anatoly Baksheev [Wed, 1 Jan 2014 18:36:08 +0000 (22:36 +0400)]
refactored Mesh, added tests, added failing "twice spin()" test

10 years agofixed bugs in cloud collection and added test
Anatoly Baksheev [Wed, 1 Jan 2014 16:51:04 +0000 (20:51 +0400)]
fixed bugs in cloud collection and added test

10 years agogetViewerPose implementation simplified (and error seems to be fixed)
Anatoly Baksheev [Wed, 1 Jan 2014 16:13:39 +0000 (20:13 +0400)]
getViewerPose implementation simplified (and error seems to be fixed)

10 years agomass switch from Affine3f to Affine3d
Anatoly Baksheev [Wed, 1 Jan 2014 15:58:41 +0000 (19:58 +0400)]
mass switch from Affine3f to Affine3d

10 years agoAffine::rotate(rvec) method
Anatoly Baksheev [Wed, 1 Jan 2014 15:26:04 +0000 (19:26 +0400)]
Affine::rotate(rvec) method

10 years agoswitched source to InputArrays
Anatoly Baksheev [Wed, 1 Jan 2014 14:21:23 +0000 (18:21 +0400)]
switched source to InputArrays

10 years agomore tests
Anatoly Baksheev [Wed, 1 Jan 2014 13:55:18 +0000 (17:55 +0400)]
more tests

10 years agocolors minor
Anatoly Baksheev [Wed, 1 Jan 2014 12:35:16 +0000 (16:35 +0400)]
colors minor

10 years agoadded vtkCloudMatSink, reworked cloud IO functions, added normals support
Anatoly Baksheev [Tue, 31 Dec 2013 17:50:38 +0000 (21:50 +0400)]
added vtkCloudMatSink, reworked cloud IO functions, added normals support

10 years agonormals support for CloudMatSource
Anatoly Baksheev [Tue, 31 Dec 2013 17:03:10 +0000 (21:03 +0400)]
normals support for CloudMatSource

10 years agoremoved incorrect and unnecessarily methods from Affine3f
Anatoly Baksheev [Tue, 31 Dec 2013 14:52:10 +0000 (18:52 +0400)]
removed incorrect and unnecessarily methods from Affine3f

10 years agogetting data from opencv_extra
Anatoly Baksheev [Fri, 27 Dec 2013 14:10:51 +0000 (18:10 +0400)]
getting data from opencv_extra

10 years agoexport scene to vrml and obj formats
Anatoly Baksheev [Fri, 13 Dec 2013 16:05:19 +0000 (20:05 +0400)]
export scene to vrml and obj formats

10 years agoremoved extra code
Anatoly Baksheev [Fri, 13 Dec 2013 15:35:48 +0000 (19:35 +0400)]
removed extra code

10 years agoreading/writing clouds functionality
Anatoly Baksheev [Fri, 13 Dec 2013 15:20:20 +0000 (19:20 +0400)]
reading/writing clouds functionality

10 years agorefactoring
Anatoly Baksheev [Thu, 12 Dec 2013 19:46:41 +0000 (23:46 +0400)]
refactoring

10 years agorewrote cloud widget in vtk filters style
Anatoly Baksheev [Thu, 12 Dec 2013 19:21:55 +0000 (23:21 +0400)]
rewrote cloud widget in vtk filters style

Conflicts:
modules/viz/src/clouds.cpp

10 years agofixed potential crash
Anatoly Baksheev [Thu, 12 Dec 2013 18:05:10 +0000 (22:05 +0400)]
fixed potential crash