peng xiao
9b3c318e85
Add super resolution's OpenCL implementation.
...
Accuracy and performance tests are also provided.
2013-06-26 08:43:23 +08:00
Vladislav Vinogradov
3c32fc1329
removed obsolete methods from gpu::Stream
2013-06-25 17:45:23 +04:00
Roman Donchenko
f36f8067bc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp
2013-06-25 15:55:52 +04:00
Roman Donchenko
1dccf5743e
Merge pull request #1024 from jet47:fix-gpuarithm-compilation
2013-06-25 14:38:18 +04:00
Alexander Smorkalov
91c519467d
WinRT build fix for samples and static libs.
2013-06-25 03:36:07 -07:00
Alexander Smorkalov
b0854c605a
Windows RT sample improved.
...
Corrent histogram output on YUV image implemented;
Some code refactoring done.
2013-06-25 03:36:05 -07:00
Alexander Smorkalov
bf22567c09
Transform selection implemented in sample GUI.
...
Gistogram output does not work propertly due color conversion problems.
2013-06-25 03:36:04 -07:00
Alexander Smorkalov
de9f659f1e
Several transforms added to sample IMFTransform.
2013-06-25 03:36:03 -07:00
Alexander Smorkalov
9e06287121
Windows RT sample updated.
...
Unused scenarious removed.
Grey scale convertion replaced with cv::Canny call.
2013-06-25 03:36:01 -07:00
Alexander Smorkalov
4990336760
Base camera access sample for Windows RT added.
...
Microsoft Media Foundation Camera Sample for Windows RT added.
2013-06-25 03:36:00 -07:00
Alexander Smorkalov
ee591efb9f
Build fix for Windows RT.
2013-06-25 03:35:58 -07:00
Alexander Smorkalov
34c6598752
Perf test failure fixes for Media Foundation.
2013-06-25 03:35:57 -07:00
Alexander Smorkalov
2bc1d3709c
GetProperty method for MSMF VideoCapture implemented.
2013-06-25 03:35:56 -07:00
Alexander Smorkalov
08a0e1c91b
TBB support for WinRT fixed.
...
Development release of TBB with WinRT support added;
TBB.dll is placed in bin folder now.
2013-06-25 03:35:54 -07:00
Alexander Smorkalov
43122939cb
Media foundation video i/o fixes.
...
Bug in Video for Windows capture init fixed;
Media Foundation based capture finalization fixed;
Highgui tests for video i/o updated.
2013-06-25 03:35:30 -07:00
yao
1227e00f3d
fix moments
2013-06-25 16:26:33 +08:00
Roman Donchenko
381057eaad
Merge pull request #1002 from asmorkalov:doc_warning_fix
2013-06-25 11:42:00 +04:00
Roman Donchenko
f8e187e1e1
Merge pull request #1035 from SpecLad:cv-concurrency
2013-06-25 11:33:16 +04:00
Roman Donchenko
e6784ca8a0
Merge pull request #1021 from alekcac:platforms
2013-06-25 11:32:52 +04:00
yao
dbdeff2069
fix stereobm crash on some cpu ocl
2013-06-25 14:12:02 +08:00
yao
6db776f957
add "-c" for cpu ocl mode in perf tests
2013-06-25 14:11:28 +08:00
Alex Leontiev
b216c0940c
Created skeleton for simplex method.
...
Added LPSolver class together with two nested classes: LPFunction and
LPConstraints. These represent function to be maximized and constraints
imposed respectively. They are implementations of interfaces Function
and Constraints respectively (latter ones are nested classes of Solver
interface, which is generic interface for all optimization algorithms to
be implemented within this project).
The next step is to implement the simplex algorithm! First, we shall
implement it for the case of constraints of the form Ax<=b and x>=0.
Then, we shall extend the sets of problems that can be handled by the
conversion to the one we've handled already. Finally, we shale
concentrate on numerical stability and efficiency.
2013-06-24 20:27:11 +03:00
Roman Donchenko
c244f000ab
Merge pull request #1030 from SpecLad:ts-impl-variants
2013-06-24 18:28:13 +04:00
Roman Donchenko
961251f0ca
Merge pull request #1029 from SpecLad:have-qt-config
2013-06-24 17:03:51 +04:00
Alexander Shishkov
bb9a0b7253
Update Info.plist.in
2013-06-24 14:52:17 +04:00
abidrahmank
a1ea1a7ec5
boxpoints documentation
2013-06-24 16:17:23 +05:30
abidrahmank
bcf9117957
Added missing python functions in highgui documentation
...
setMouseCallback
createTrackbar
2013-06-24 15:53:45 +05:30
Alexander Smorkalov
996f02a531
Multiple Media Foundation video i/o fixes.
...
Video i/o tests enabled for media foundation;
Negative stride support added to VideoCapture;
Error handling improved, dead lock in case of playback error fixed;
Some code refacotring done.
2013-06-24 02:45:27 -07:00
Alexander Smorkalov
0c9d776083
Media Foundation-based code refactoring.
...
I* + SafeRelease -> ComPtr.
2013-06-24 02:45:26 -07:00
Alexander Smorkalov
e94cc0b5ee
Media Foundation camera capture fixed.
...
Camera-based VideoCapture updated to fit changes in ImageGrabber from prev
commit
2013-06-24 02:45:25 -07:00
Alexander Smorkalov
9fb762ccec
VideoCapture for video files implemented.
...
Set and Get methods are not implemented;
Camera based video capture is broken due to modifications.
2013-06-24 02:45:24 -07:00
Alexander Smorkalov
22b0cfbaa2
Media Foundation-based VideoWriter improvements.
...
FourCC parameter handlig added;
Smart pointers instead SafeRelease call;
Windows RT support (vertical mirroring).
2013-06-24 02:45:23 -07:00
Alexander Smorkalov
ccb8292e8e
Media Foundation-based VideoWriter added
2013-06-24 02:45:22 -07:00
Alexander Smorkalov
033e3092a3
Media Foundation based VideoCapture improved
...
Code formating fixed;
GrabFrame method implemented correclty.
2013-06-24 02:45:21 -07:00
Alexander Smorkalov
e3577c2f58
Build with dev release of TBB enabled.
2013-06-24 02:45:21 -07:00
Roman Donchenko
3bab7391d0
Merge pull request #1028 from SpecLad:ocl-clahe-dtor
2013-06-24 13:18:28 +04:00
Roman Donchenko
c16316c4b4
Replaced the semi-public CV_PARALLEL_FRAMEWORK macro with a function.
...
That way, core/internal.hpp doesn't have to depend on cvconfig.h, which we
don't ship.
2013-06-24 12:57:14 +04:00
Roman Donchenko
171a56fe82
Merge pull request #1034 from pengx17:2.4_oclmat_inoutarray
2013-06-24 12:27:26 +04:00
Roman Donchenko
7cb047e2d9
Merge pull request #1031 from pengx17:2.4_fix_converTo
2013-06-24 12:25:48 +04:00
Roman Donchenko
4ed3d33dd7
Merge pull request #1025 from bitwangyaoyao:2.4_tests
2013-06-24 12:11:04 +04:00
Roman Donchenko
b0421cafab
Merge pull request #1022 from bitwangyaoyao:2.4_hog
2013-06-24 12:08:59 +04:00
abidrahmank
37f4e400e4
Added cv2.boxPoints() functionality to Python bindings (Feature #2023 )
...
http://www.code.opencv.org/issues/2023
eg:
In [3]: box = ((10,10),(5,5),0)
In [4]: cv2.boxPoints(box)
Out[4]:
array([[ 7.5, 12.5],
[ 7.5, 7.5],
[ 12.5, 7.5],
[ 12.5, 12.5]], dtype=float32)
2013-06-24 12:13:59 +05:30
Vladislav Vinogradov
98bd401534
fix gpu::DeviceInfo compilation under linux
...
glibc defines major and minor macros
which conflict with gpu::DeviceInfo methods with the same name
2013-06-24 10:11:44 +04:00
Roman Donchenko
5fa200763f
Merge pull request #1026 from SpecLad:ts-version-prop
2013-06-21 18:00:59 +04:00
Roman Donchenko
eff6dccb3b
Merge pull request #1014 from jet47:gpustereo-refactoring
2013-06-21 17:38:36 +04:00
Roman Donchenko
b20c9ad2d1
Merge pull request #1015 from SpecLad:merge-2.4
2013-06-21 17:38:04 +04:00
Roman Donchenko
e3ae36dcb3
Merge pull request #1033 from SpecLad:xls++
2013-06-21 17:13:33 +04:00
Roman Donchenko
d4a8b87645
Wrote relevant docs.
2013-06-21 16:45:17 +04:00
Roman Donchenko
84639e444b
Merge pull request #1010 from jet47:gpufilters-refactoring
2013-06-21 14:45:50 +04:00
Roman Donchenko
0e3a9eaf98
Made Collector render property sets as dicts instead of tuples of pairs.
2013-06-21 13:43:16 +04:00
