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

10 years agoMerge pull request #2147 from ilya-lavrenov:tapi_sqrt
Andrey Pavlenko [Tue, 14 Jan 2014 07:34:02 +0000 (11:34 +0400)]
Merge pull request #2147 from ilya-lavrenov:tapi_sqrt

10 years agodeleted extra arg in case of power=0.5
Ilya Lavrenov [Mon, 13 Jan 2014 15:58:27 +0000 (19:58 +0400)]
deleted extra arg in case of power=0.5

10 years agoadded perf test for cv::sqrBoxFilter
Ilya Lavrenov [Mon, 13 Jan 2014 14:51:49 +0000 (18:51 +0400)]
added perf test for cv::sqrBoxFilter

10 years agofixed cv::integral perf test
Ilya Lavrenov [Mon, 13 Jan 2014 14:36:25 +0000 (18:36 +0400)]
fixed cv::integral perf test

10 years agoMerge pull request #2136 from SpecLad:python-ver
Roman Donchenko [Mon, 13 Jan 2014 14:16:59 +0000 (18:16 +0400)]
Merge pull request #2136 from SpecLad:python-ver

10 years agoadded perf test for cv::Moments
Ilya Lavrenov [Mon, 13 Jan 2014 13:50:14 +0000 (17:50 +0400)]
added perf test for cv::Moments

10 years agoswitching to `CL_PERF_TEST_P`, adding `safeFinish()` to flush CL queue
Andrey Pavlenko [Mon, 13 Jan 2014 12:58:36 +0000 (16:58 +0400)]
switching to `CL_PERF_TEST_P`, adding `safeFinish()` to flush CL queue

10 years agoMerge pull request #2137 from ilya-lavrenov:gitignore
Roman Donchenko [Mon, 13 Jan 2014 12:33:15 +0000 (16:33 +0400)]
Merge pull request #2137 from ilya-lavrenov:gitignore

10 years agoMerge pull request #2138 from alekcac:python_tutorial_fix
Roman Donchenko [Mon, 13 Jan 2014 12:32:41 +0000 (16:32 +0400)]
Merge pull request #2138 from alekcac:python_tutorial_fix

10 years agoMerge pull request #2121 from ilya-lavrenov:tapi_perf
Roman Donchenko [Mon, 13 Jan 2014 12:30:33 +0000 (16:30 +0400)]
Merge pull request #2121 from ilya-lavrenov:tapi_perf

10 years agoMerge pull request #2108 from pemmanuelviel:flannMemoryLeak
Roman Donchenko [Mon, 13 Jan 2014 12:26:02 +0000 (16:26 +0400)]
Merge pull request #2108 from pemmanuelviel:flannMemoryLeak

10 years agoadded perf tests for cv::medianBlur
Ilya Lavrenov [Mon, 13 Jan 2014 11:59:24 +0000 (15:59 +0400)]
added perf tests for cv::medianBlur

10 years agoadded perf tests for cv::morphologyEx
Ilya Lavrenov [Mon, 13 Jan 2014 11:43:09 +0000 (15:43 +0400)]
added perf tests for cv::morphologyEx

10 years agoadded perf tests for cv::dilate
Ilya Lavrenov [Mon, 13 Jan 2014 11:30:35 +0000 (15:30 +0400)]
added perf tests for cv::dilate

10 years agoadded perf tests for filters
Ilya Lavrenov [Mon, 13 Jan 2014 11:26:50 +0000 (15:26 +0400)]
added perf tests for filters

10 years agoadded perf tests to some imgproc functions
Ilya Lavrenov [Mon, 13 Jan 2014 11:01:52 +0000 (15:01 +0400)]
added perf tests to some imgproc functions

10 years agoadded perf test for cv::cvtColor, pyr operations
Ilya Lavrenov [Mon, 13 Jan 2014 10:14:22 +0000 (14:14 +0400)]
added perf test for cv::cvtColor, pyr operations

10 years agoadded perf tests for cv::blendLinear
Ilya Lavrenov [Mon, 13 Jan 2014 10:06:15 +0000 (14:06 +0400)]
added perf tests for cv::blendLinear

10 years agoadded perf tests for T-API warp operations
Ilya Lavrenov [Mon, 13 Jan 2014 09:09:58 +0000 (13:09 +0400)]
added perf tests for T-API warp operations

10 years agoMerge pull request #2135 from alalek:ocl_runtime_cleanup_2
Andrey Pavlenko [Sat, 11 Jan 2014 13:15:21 +0000 (17:15 +0400)]
Merge pull request #2135 from alalek:ocl_runtime_cleanup_2

10 years agoMerge pull request #2112 from ilya-lavrenov:tapi_stitching
Andrey Pavlenko [Sat, 11 Jan 2014 12:39:21 +0000 (16:39 +0400)]
Merge pull request #2112 from ilya-lavrenov:tapi_stitching

10 years agochanged code in python tutorial, these functions don’t return image
Alexander Shishkov [Sat, 11 Jan 2014 12:35:41 +0000 (16:35 +0400)]
changed code in python tutorial, these functions don’t return image

10 years agoupdated .gitignore
Ilya Lavrenov [Fri, 10 Jan 2014 14:59:06 +0000 (18:59 +0400)]
updated .gitignore

10 years agoadded NORM_L2SQR type to cv::norm
Ilya Lavrenov [Tue, 7 Jan 2014 16:32:22 +0000 (20:32 +0400)]
added NORM_L2SQR type to cv::norm

10 years agoadded cv::PSNR performance test
Ilya Lavrenov [Tue, 7 Jan 2014 16:17:45 +0000 (20:17 +0400)]
added cv::PSNR performance test

10 years agoadded some performance tests
Ilya Lavrenov [Tue, 7 Jan 2014 11:08:48 +0000 (15:08 +0400)]
added some performance tests

10 years agoadded mask support to cv::norm, cv::meanStdDev
Ilya Lavrenov [Sun, 5 Jan 2014 20:12:13 +0000 (00:12 +0400)]
added mask support to cv::norm, cv::meanStdDev

10 years agoDon't use PYTHON_VERSION_STRING when searching for Python libraries
Roman Donchenko [Fri, 10 Jan 2014 14:40:47 +0000 (18:40 +0400)]
Don't use PYTHON_VERSION_STRING when searching for Python libraries

It may be an arbitrary string, and, for example, in Ubuntu 13.10
it's set to "2.7.5+", which breaks the find script.

10 years agoupdated docs according to the last changes
Ilya Lavrenov [Thu, 9 Jan 2014 13:00:08 +0000 (17:00 +0400)]
updated docs according to the last changes

10 years agoreplaced Mat by Input/Output arrays
Ilya Lavrenov [Thu, 9 Jan 2014 11:21:07 +0000 (15:21 +0400)]
replaced Mat by Input/Output arrays

10 years agoadded OpenCL accelerated warpers
Ilya Lavrenov [Wed, 1 Jan 2014 19:46:19 +0000 (23:46 +0400)]
added OpenCL accelerated warpers

10 years agoMerge pull request #2105 from ilya-lavrenov:norm
Roman Donchenko [Fri, 10 Jan 2014 14:12:08 +0000 (18:12 +0400)]
Merge pull request #2105 from ilya-lavrenov:norm

10 years agoMerge pull request #2132 from ComFreek:patch-2
Roman Donchenko [Fri, 10 Jan 2014 07:44:45 +0000 (11:44 +0400)]
Merge pull request #2132 from ComFreek:patch-2

10 years agocore/ocl: runtime, remove unused declarations
Alexander Alekhin [Thu, 9 Jan 2014 15:07:39 +0000 (19:07 +0400)]
core/ocl: runtime, remove unused declarations

10 years agoadding Haar & LBP cascades perf test using UMat, removing old incomplete test
Andrey Pavlenko [Thu, 9 Jan 2014 20:08:15 +0000 (00:08 +0400)]
adding Haar & LBP cascades perf test using UMat, removing old incomplete test

10 years agoCorrected package name in tutorial
ComFreek [Thu, 9 Jan 2014 16:24:20 +0000 (17:24 +0100)]
Corrected package name in tutorial

See also #2101

10 years agofixed case with zero mask
Ilya Lavrenov [Thu, 9 Jan 2014 13:32:13 +0000 (17:32 +0400)]
fixed case with zero mask

10 years agoMerge pull request #2128 from alalek:ocl_cleanup_runtime
Andrey Pavlenko [Thu, 9 Jan 2014 13:08:48 +0000 (17:08 +0400)]
Merge pull request #2128 from alalek:ocl_cleanup_runtime

10 years agoMerge pull request #2129 from ilya-lavrenov:mix_fix
Roman Donchenko [Thu, 9 Jan 2014 13:04:03 +0000 (17:04 +0400)]
Merge pull request #2129 from ilya-lavrenov:mix_fix

10 years agoMerge pull request #2115 from nghiaho12:kmeans_sample
Roman Donchenko [Thu, 9 Jan 2014 12:58:29 +0000 (16:58 +0400)]
Merge pull request #2115 from nghiaho12:kmeans_sample

10 years agoMerge pull request #2118 from ilya-lavrenov:semicolons
Roman Donchenko [Thu, 9 Jan 2014 12:21:48 +0000 (16:21 +0400)]
Merge pull request #2118 from ilya-lavrenov:semicolons

10 years agoMerge pull request #2119 from d-schmidt:patch-1
Roman Donchenko [Thu, 9 Jan 2014 10:44:06 +0000 (14:44 +0400)]
Merge pull request #2119 from d-schmidt:patch-1

10 years agofixed cv::mixChannels perf test
Ilya Lavrenov [Thu, 9 Jan 2014 10:26:44 +0000 (14:26 +0400)]
fixed cv::mixChannels perf test

10 years agoRemoved unecessary initialisation of Mat centers.
Nghia Ho [Thu, 9 Jan 2014 10:04:17 +0000 (21:04 +1100)]
Removed unecessary initialisation of Mat centers.

10 years agoMerge pull request #2126 from yinghau76:master
Roman Donchenko [Thu, 9 Jan 2014 10:00:52 +0000 (14:00 +0400)]
Merge pull request #2126 from yinghau76:master

10 years agoadded mask support to cv::norm, cv::meanStdDev
Ilya Lavrenov [Sun, 5 Jan 2014 20:12:13 +0000 (00:12 +0400)]
added mask support to cv::norm, cv::meanStdDev

10 years agocore/ocl: cleanup unused files
Alexander Alekhin [Thu, 9 Jan 2014 09:47:04 +0000 (13:47 +0400)]
core/ocl: cleanup unused files

10 years agoMerge pull request #2106 from robbertkl:patch-2
Roman Donchenko [Thu, 9 Jan 2014 09:25:59 +0000 (13:25 +0400)]
Merge pull request #2106 from robbertkl:patch-2

10 years agoMerge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24
Roman Donchenko [Thu, 9 Jan 2014 09:24:20 +0000 (13:24 +0400)]
Merge pull request #2114 from kazuki-ma:SparseMat_convertTo_typofix_24

10 years agoMerge tag '3.0-ocl-tech-preview' (-s ours)
Roman Donchenko [Thu, 9 Jan 2014 08:42:58 +0000 (12:42 +0400)]
Merge tag '3.0-ocl-tech-preview' (-s ours)