Roman Donchenko
659c5345d9
Merge pull request #2122 from adishavit:feature-HandleMouseWheel
11 years ago
Roman Donchenko
58afe5dd17
Merge pull request #2140 from Daniil-Osokin:fix_saving_untrained_svm_model
11 years ago
Andrey Pavlenko
664c9b15cf
Merge pull request #2152 from ilya-lavrenov:tapi_canny
11 years ago
Roman Donchenko
a502ffbd2c
Updated required CMake version in docs to match reality.
11 years ago
Roman Donchenko
e9805e444f
Fixed an overly-narrow assertion in cv::norm.
...
size() requires that the matrix is two-dimensional, and norm()
works on higher dimensions.
11 years ago
Roman Donchenko
5f8d8c0069
Added a test for matrix-to-vector copy and convert.
11 years ago
Roman Donchenko
4e4a7d0353
Removed an unnecessary workaround for matrix-to-vector copyTo.
11 years ago
Roman Donchenko
ee97a5e757
Re-fix bug #3319 with less side effects.
11 years ago
Roman Donchenko
f02204847a
Revert "fixed bug #3319"
...
See 092f916
for explanation.
This reverts commit 4f9c081dc3
.
11 years ago
Konstantin Matskevich
e9e9e00d45
replaced sprintf with cv::format
11 years ago
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.
11 years ago
Ilya Lavrenov
93a818684c
ported cv::Canny to T-API
11 years ago
Andrey Pavlenko
8dbc96fed8
Merge pull request #2143 from Daniil-Osokin:fix_docs_cvt_color_alpha_channel
11 years ago
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>
11 years ago
Ilya Lavrenov
63a5e39e2c
added cv::reduce to T-API
11 years ago
Daniil Osokin
8ce691e679
Fixed cvtColor alpha channel docs
11 years ago
Adi Shavit
8fd0fd538d
Doc fix.
11 years ago
Roman Donchenko
07e08f7a3d
Merge pull request #2141 from ilya-lavrenov:perf_warp
11 years ago
Roman Donchenko
63c61b4b98
Revert "replaced sprintf with cv::format"
...
Fixing build breakage.
This reverts commit b83eff7ecf
.
11 years ago
Roman Donchenko
ddfd1854a7
Merge pull request #2151 from KonstantinMatskevich:testdata_path_calib3d
11 years ago
Konstantin Matskevich
b83eff7ecf
replaced sprintf with cv::format
11 years ago
Adi Shavit
46f06d82c9
Update docs.
11 years ago
Adi Shavit
8802d62cc5
Updated docs.
11 years ago
Adi Shavit
24333569aa
Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect()
11 years ago
Roman Donchenko
b0af6a2b58
Merge pull request #2127 from apavlenko:perf_cascades
11 years ago
Ilya Lavrenov
82d3efc6c0
added perf test for cv::Canny
11 years ago
Konstantin Matskevich
ab18c2d132
changed testdata path for calib3d
11 years ago
Andrey Pavlenko
a164381cc6
Merge pull request #2150 from ilya-lavrenov:tapi_cvtcolor
11 years ago
Adi Shavit
e45cf2173f
[HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API.
11 years ago
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...
}
11 years ago
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.
11 years ago
Andrey Pavlenko
c7d90c8b32
adding old cascade
11 years ago
Andrey Pavlenko
9b7b360bf7
fixing compilation if `WITH_OPENCL=OFF`
11 years ago
Ilya Lavrenov
7ed692bf92
fixed cv::cvtColor
11 years ago
Roman Donchenko
2fde4d8a94
Merge pull request #2145 from andreasBihlmaier:2.4
11 years ago
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
11 years ago
Andrey Pavlenko
fdb1019b9e
Merge pull request #2147 from ilya-lavrenov:tapi_sqrt
11 years ago
Matthias Bady
06fb073b8b
Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
11 years ago
Ilya Lavrenov
09bff78d63
deleted extra arg in case of power=0.5
11 years ago
Roman Donchenko
2443e8090e
Merge pull request #2133 from apavlenko:2.4-perf_haar
11 years ago
ahb
49dfa5a17f
Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8
...
OpenCV Error: Unknown error code -6 (OpenCL function is not available: [clGetPlatformIDs]) in opencl_check_fn, file /home/ahb/software/opencv/modules/ocl/src/cl_runtime/cl_runtime.cpp, line 83
The issue results from modules/ocl/src/cl_runtime/cl_runtime.cpp checking for
"linux" instead of "__linux__" (cp. http://sourceforge.net/p/predef/wiki/OperatingSystems/ )
Adjust all other occurrences of "defined(linux)" as well.
11 years ago
Ilya Lavrenov
30b5234e9a
added perf test for cv::sqrBoxFilter
11 years ago
Ilya Lavrenov
8702fceb4b
fixed cv::integral perf test
11 years ago
Roman Donchenko
c3bfe3f33e
Merge pull request #2136 from SpecLad:python-ver
11 years ago
Andrey Pavlenko
4c99196399
adding `finish()` to flush CL queue, renaming the test to match 'master' branch
11 years ago
Ilya Lavrenov
a7a7b80ff8
added perf test for cv::Moments
11 years ago
Andrey Pavlenko
520a692fda
switching to `CL_PERF_TEST_P`, adding `safeFinish()` to flush CL queue
11 years ago
Roman Donchenko
9628abc786
Merge pull request #2137 from ilya-lavrenov:gitignore
11 years ago
Roman Donchenko
85c713b59e
Merge pull request #2138 from alekcac:python_tutorial_fix
11 years ago
Roman Donchenko
af9cd79e16
Merge pull request #2121 from ilya-lavrenov:tapi_perf
11 years ago