platform/upstream/opencv.git
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

10 years agorefactored Keyboard and Mouse Events
Anatoly Baksheev [Sun, 8 Dec 2013 17:00:00 +0000 (21:00 +0400)]
refactored Keyboard and Mouse Events

10 years agoremoved vizActor (since unnecessarily in new design concept with simplified widgets)
Anatoly Baksheev [Sun, 8 Dec 2013 16:58:55 +0000 (20:58 +0400)]
removed vizActor (since unnecessarily in new design concept with simplified widgets)

10 years agorenaming
Anatoly Baksheev [Sun, 8 Dec 2013 16:33:53 +0000 (20:33 +0400)]
renaming

10 years agokinect camera CAD parameters
Anatoly Baksheev [Sun, 8 Dec 2013 15:37:44 +0000 (19:37 +0400)]
kinect camera CAD parameters

10 years agoreading/writing trajectories
Anatoly Baksheev [Sun, 8 Dec 2013 15:31:23 +0000 (19:31 +0400)]
reading/writing trajectories

10 years agofor shapes switched vtkDataSetMapper to more efficient vtkPolyDataMapper
Anatoly Baksheev [Sun, 8 Dec 2013 14:31:04 +0000 (18:31 +0400)]
for shapes switched vtkDataSetMapper to more efficient vtkPolyDataMapper

10 years agominor
Anatoly Baksheev [Sun, 8 Dec 2013 14:11:19 +0000 (18:11 +0400)]
minor

10 years agorefactored Trajectory: split into Trajectory and TrajectoryFrustums)
Anatoly Baksheev [Sun, 8 Dec 2013 14:07:16 +0000 (18:07 +0400)]
refactored Trajectory: split into Trajectory and TrajectoryFrustums)

10 years agorenamed Spheres Trajectory, minor changes in Trajectory
Anatoly Baksheev [Sun, 8 Dec 2013 13:12:02 +0000 (17:12 +0400)]
renamed Spheres Trajectory, minor changes in Trajectory

10 years agominor
Anatoly Baksheev [Sun, 8 Dec 2013 12:57:09 +0000 (16:57 +0400)]
minor

10 years agoreduced exported interface names (to make IntelliSense hints less littered)
Anatoly Baksheev [Sun, 1 Dec 2013 11:25:44 +0000 (15:25 +0400)]
reduced exported interface names (to make IntelliSense hints less littered)

10 years agoallow fast switch between actors (except mesh, cloud, cloud collection)
Anatoly Baksheev [Sun, 1 Dec 2013 10:58:29 +0000 (14:58 +0400)]
allow fast switch between actors (except mesh, cloud, cloud collection)

10 years agominor changes, opencv cross-branch code
Anatoly Baksheev [Sat, 30 Nov 2013 13:57:53 +0000 (17:57 +0400)]
minor changes, opencv cross-branch code

10 years agosupport gray color clouds
Anatoly Baksheev [Sat, 30 Nov 2013 15:00:10 +0000 (19:00 +0400)]
support gray color clouds

10 years agoviz: rich set of named colors
Anatoly Baksheev [Thu, 28 Nov 2013 08:45:22 +0000 (12:45 +0400)]
viz: rich set of named colors

10 years agoMerge pull request #2172 from Nerei:compilation_and_warnings
Andrey Pavlenko [Sun, 19 Jan 2014 07:44:36 +0000 (11:44 +0400)]
Merge pull request #2172 from Nerei:compilation_and_warnings

10 years agowarnings
Anatoly Baksheev [Sun, 19 Jan 2014 00:07:24 +0000 (04:07 +0400)]
warnings

10 years agowarnings and compilation with installed Windows 8.1 SDK
Anatoly Baksheev [Sun, 19 Jan 2014 00:07:17 +0000 (04:07 +0400)]
warnings and compilation with installed Windows 8.1 SDK

10 years agoMerge pull request #2157 from k0da:master
Roman Donchenko [Fri, 17 Jan 2014 15:00:19 +0000 (19:00 +0400)]
Merge pull request #2157 from k0da:master

10 years agoMerge pull request #2146 from SpecLad:merge-2.4
Roman Donchenko [Fri, 17 Jan 2014 12:28:29 +0000 (16:28 +0400)]
Merge pull request #2146 from SpecLad:merge-2.4

10 years agoMerge pull request #2122 from adishavit:feature-HandleMouseWheel
Roman Donchenko [Fri, 17 Jan 2014 10:58:27 +0000 (14:58 +0400)]
Merge pull request #2122 from adishavit:feature-HandleMouseWheel

10 years agoMerge pull request #2152 from ilya-lavrenov:tapi_canny
Andrey Pavlenko [Fri, 17 Jan 2014 10:52:17 +0000 (14:52 +0400)]
Merge pull request #2152 from ilya-lavrenov:tapi_canny

10 years agoRevert 4f9c081
Roman Donchenko [Fri, 17 Jan 2014 08:51:52 +0000 (12:51 +0400)]
Revert 4f9c081

That commit introduces problems, as it breaks certain use cases of
OpenCV functions; for example, convertTo of an Nx1 matrix to an
std::vector.

Since vectors can't store separate width and height values, OpenCV
considers them to always be 1xN. So even though the vector is created with
.create(N, 1), the Mat passed to getContinousSize has dimensions 1xN,
and the size comparison fails, even though the operation itself is safe.

This is a use case we probably don't want to break, at the very least
for backwards compatibility. So I'm reverting the commit. This will also
unfix bug #3319; I'll submit a less intrusive solution as a PR to 2.4, which
will also revert 4f9c081 there.

10 years agoported cv::Canny to T-API
Ilya Lavrenov [Tue, 14 Jan 2014 10:10:24 +0000 (14:10 +0400)]
ported cv::Canny to T-API

10 years agoUse __vector instead of vector as suggests Eigen
Dinar Valeev [Thu, 16 Jan 2014 20:53:49 +0000 (21:53 +0100)]
Use __vector instead of vector as suggests Eigen

This fixes build on PowerPC where Eigen unsets vector, bool and pixel

Signed-off-by: Dinar Valeev <dvaleev@suse.com>
10 years agoDoc fix.
Adi Shavit [Thu, 16 Jan 2014 14:30:54 +0000 (16:30 +0200)]
Doc fix.

10 years agoMerge pull request #2141 from ilya-lavrenov:perf_warp
Roman Donchenko [Thu, 16 Jan 2014 14:03:21 +0000 (18:03 +0400)]
Merge pull request #2141 from ilya-lavrenov:perf_warp

10 years agoRevert "replaced sprintf with cv::format"
Roman Donchenko [Thu, 16 Jan 2014 13:58:26 +0000 (17:58 +0400)]
Revert "replaced sprintf with cv::format"

Fixing build breakage.

This reverts commit b83eff7ecf0a3a8a9d706168150d569c94f0b71e.

10 years agoMerge pull request #2151 from KonstantinMatskevich:testdata_path_calib3d
Roman Donchenko [Thu, 16 Jan 2014 12:44:24 +0000 (16:44 +0400)]
Merge pull request #2151 from KonstantinMatskevich:testdata_path_calib3d

10 years agoreplaced sprintf with cv::format
Konstantin Matskevich [Thu, 16 Jan 2014 12:18:02 +0000 (16:18 +0400)]
replaced sprintf with cv::format

10 years agoUpdate docs.
Adi Shavit [Thu, 16 Jan 2014 10:51:14 +0000 (12:51 +0200)]
Update docs.

10 years agoUpdated docs.
Adi Shavit [Thu, 16 Jan 2014 09:25:57 +0000 (11:25 +0200)]
Updated docs.

10 years agoSmall fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect()
Adi Shavit [Thu, 16 Jan 2014 09:09:25 +0000 (11:09 +0200)]
Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect()

10 years agoMerge pull request #2127 from apavlenko:perf_cascades
Roman Donchenko [Thu, 16 Jan 2014 08:37:02 +0000 (12:37 +0400)]
Merge pull request #2127 from apavlenko:perf_cascades

10 years agoadded perf test for cv::Canny
Ilya Lavrenov [Mon, 13 Jan 2014 15:46:00 +0000 (19:46 +0400)]
added perf test for cv::Canny

10 years agochanged testdata path for calib3d
Konstantin Matskevich [Wed, 15 Jan 2014 11:08:09 +0000 (15:08 +0400)]
changed testdata path for calib3d

10 years agoMerge pull request #2150 from ilya-lavrenov:tapi_cvtcolor
Andrey Pavlenko [Wed, 15 Jan 2014 09:45:28 +0000 (13:45 +0400)]
Merge pull request #2150 from ilya-lavrenov:tapi_cvtcolor

10 years ago[HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated...
Adi Shavit [Sun, 12 Jan 2014 07:33:08 +0000 (09:33 +0200)]
[HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API.

10 years agoAdded support for mouse-wheel events on Windows.
Adi Shavit [Tue, 7 Jan 2014 19:17:57 +0000 (21:17 +0200)]
Added support for mouse-wheel events on Windows.
To be used in the mouse callback like this:
    if (CV_EVENT_MOUSEWHEEL == CV_GET_MOUSEWHEEL_EVENT(event))
    {
       int delta= CV_GET_WHEEL_DELTA(event);
       // use delta...
    }

10 years agoSmall fix for extracting mouse coordinates on Windows, in a way that will always...
Adi Shavit [Sun, 5 Jan 2014 15:21:59 +0000 (17:21 +0200)]
Small fix for extracting mouse coordinates on Windows, in a way that will always work with multiple monitors.
This is the way recommended by Microsoft.

10 years agoadding old cascade
Andrey Pavlenko [Tue, 14 Jan 2014 19:15:50 +0000 (23:15 +0400)]
adding old cascade

10 years agofixing compilation if `WITH_OPENCL=OFF`
Andrey Pavlenko [Tue, 14 Jan 2014 13:50:00 +0000 (17:50 +0400)]
fixing compilation if `WITH_OPENCL=OFF`

10 years agofixed cv::cvtColor
Ilya Lavrenov [Tue, 14 Jan 2014 12:15:42 +0000 (16:15 +0400)]
fixed cv::cvtColor

10 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Mon, 13 Jan 2014 15:28:43 +0000 (19:28 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp