Anatoly Baksheev
f6e9b81188
reduced exported interface names (to make IntelliSense hints less littered)
2014-01-19 18:38:38 +04:00
Anatoly Baksheev
44c1d4dfdc
allow fast switch between actors (except mesh, cloud, cloud collection)
2014-01-19 18:38:38 +04:00
Anatoly Baksheev
2d63f60d43
minor changes, opencv cross-branch code
2014-01-19 18:38:38 +04:00
Anatoly Baksheev
15fd3faa40
support gray color clouds
2014-01-19 18:38:38 +04:00
Anatoly Baksheev
2cbfb04144
viz: rich set of named colors
2014-01-19 18:38:37 +04:00
Andrey Pavlenko
f60f8a7346
Merge pull request #2172 from Nerei:compilation_and_warnings
2014-01-19 11:44:37 +04:00
Anatoly Baksheev
4e20e06ee7
warnings
2014-01-19 04:07:24 +04:00
Anatoly Baksheev
0fc4ac4f1f
warnings and compilation with installed Windows 8.1 SDK
2014-01-19 04:07:17 +04:00
Roman Donchenko
e965f3d3d4
Merge pull request #2157 from k0da:master
2014-01-17 19:00:19 +04:00
Roman Donchenko
79fcc06a4b
Merge pull request #2146 from SpecLad:merge-2.4
2014-01-17 16:28:30 +04:00
Roman Donchenko
659c5345d9
Merge pull request #2122 from adishavit:feature-HandleMouseWheel
2014-01-17 14:58:28 +04:00
Andrey Pavlenko
664c9b15cf
Merge pull request #2152 from ilya-lavrenov:tapi_canny
2014-01-17 14:52:17 +04:00
Roman Donchenko
092f916db9
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.
2014-01-17 12:51:52 +04:00
Ilya Lavrenov
93a818684c
ported cv::Canny to T-API
2014-01-17 11:13:28 +04:00
Dinar Valeev
711f07a34c
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>
2014-01-16 21:53:49 +01:00
Adi Shavit
8fd0fd538d
Doc fix.
2014-01-16 16:30:54 +02:00
Roman Donchenko
07e08f7a3d
Merge pull request #2141 from ilya-lavrenov:perf_warp
2014-01-16 18:03:21 +04:00
Roman Donchenko
63c61b4b98
Revert "replaced sprintf with cv::format"
...
Fixing build breakage.
This reverts commit b83eff7ecf
.
2014-01-16 17:58:26 +04:00
Roman Donchenko
ddfd1854a7
Merge pull request #2151 from KonstantinMatskevich:testdata_path_calib3d
2014-01-16 16:44:24 +04:00
Konstantin Matskevich
b83eff7ecf
replaced sprintf with cv::format
2014-01-16 16:18:02 +04:00
Adi Shavit
46f06d82c9
Update docs.
2014-01-16 12:51:14 +02:00
Adi Shavit
8802d62cc5
Updated docs.
2014-01-16 11:25:57 +02:00
Adi Shavit
24333569aa
Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect()
2014-01-16 11:09:25 +02:00
Roman Donchenko
b0af6a2b58
Merge pull request #2127 from apavlenko:perf_cascades
2014-01-16 12:37:02 +04:00
Ilya Lavrenov
82d3efc6c0
added perf test for cv::Canny
2014-01-15 20:06:24 +04:00
Konstantin Matskevich
ab18c2d132
changed testdata path for calib3d
2014-01-15 15:08:09 +04:00
Andrey Pavlenko
a164381cc6
Merge pull request #2150 from ilya-lavrenov:tapi_cvtcolor
2014-01-15 13:45:28 +04:00
Adi Shavit
e45cf2173f
[HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API.
2014-01-14 21:33:32 +02:00
Adi Shavit
fecd5c994b
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...
}
2014-01-14 21:20:05 +02:00
Adi Shavit
9dc0bfc755
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.
2014-01-14 21:20:04 +02:00
Andrey Pavlenko
c7d90c8b32
adding old cascade
2014-01-14 23:15:50 +04:00
Andrey Pavlenko
9b7b360bf7
fixing compilation if WITH_OPENCL=OFF
2014-01-14 17:50:00 +04:00
Ilya Lavrenov
7ed692bf92
fixed cv::cvtColor
2014-01-14 16:16:35 +04:00
Roman Donchenko
fee2ed37fc
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
2014-01-14 11:53:59 +04:00
Andrey Pavlenko
fdb1019b9e
Merge pull request #2147 from ilya-lavrenov:tapi_sqrt
2014-01-14 11:34:03 +04:00
Ilya Lavrenov
09bff78d63
deleted extra arg in case of power=0.5
2014-01-13 19:59:10 +04:00
Ilya Lavrenov
30b5234e9a
added perf test for cv::sqrBoxFilter
2014-01-13 18:51:49 +04:00
Ilya Lavrenov
8702fceb4b
fixed cv::integral perf test
2014-01-13 18:36:52 +04:00
Roman Donchenko
c3bfe3f33e
Merge pull request #2136 from SpecLad:python-ver
2014-01-13 18:17:00 +04:00
Ilya Lavrenov
a7a7b80ff8
added perf test for cv::Moments
2014-01-13 17:50:14 +04:00
Andrey Pavlenko
520a692fda
switching to CL_PERF_TEST_P
, adding safeFinish()
to flush CL queue
2014-01-13 16:58:36 +04:00
Roman Donchenko
9628abc786
Merge pull request #2137 from ilya-lavrenov:gitignore
2014-01-13 16:33:16 +04:00
Roman Donchenko
85c713b59e
Merge pull request #2138 from alekcac:python_tutorial_fix
2014-01-13 16:32:42 +04:00
Roman Donchenko
af9cd79e16
Merge pull request #2121 from ilya-lavrenov:tapi_perf
2014-01-13 16:30:33 +04:00
Roman Donchenko
87e0c26129
Merge pull request #2108 from pemmanuelviel:flannMemoryLeak
2014-01-13 16:26:02 +04:00
Ilya Lavrenov
6fb878a65f
added perf tests for cv::medianBlur
2014-01-13 15:59:24 +04:00
Ilya Lavrenov
5e7fd8bd7e
added perf tests for cv::morphologyEx
2014-01-13 15:43:09 +04:00
Ilya Lavrenov
5a2a0b326a
added perf tests for cv::dilate
2014-01-13 15:30:35 +04:00
Ilya Lavrenov
f61597dce8
added perf tests for filters
2014-01-13 15:26:50 +04:00
Ilya Lavrenov
04ae46e21c
added perf tests to some imgproc functions
2014-01-13 15:01:52 +04:00