Commit Graph

9162 Commits

Author SHA1 Message Date
Vladislav Vinogradov
afb08b33c7 removed obsolete API from gpuarithm module 2013-07-12 08:40:30 +04:00
Vladislav Vinogradov
0d9e3cfa37 updated documentation 2013-07-12 08:12:48 +04:00
Vladislav Vinogradov
6d6ff26887 refactored gpu::ImagePyramid (converted it to abstract interface) 2013-07-12 08:12:48 +04:00
Vladislav Vinogradov
2932beddcf switched to Input/Output Array in gpuwarping functions 2013-07-12 08:12:48 +04:00
Alex Leontiev
6db2596ca9 Convenience fixes
Attempting to fix issues pointed out by Vadim Pisarevsky during the pull
request review. In particular, the following things are done:
*) The mechanism of debug info printing is changed and made more
procedure-style than the previous macro-style
*) z in solveLP() is now returned as a column-vector
*) Func parameter of solveLP() is now allowed to be column-vector, in
which case it is understood to be the transpose of what we need
*) Func and Constr now can contain floats, not only doubles (in the
former case the conversion is done via convertTo())
*)different constructor to allocate space for z in solveLP() is used,
making the size of z more explicit (this is just a notation change, not
functional, both constructors are achieving the same goal)
*) (big) mat.hpp and iostream headers are moved to precomp-headers from
optim.hpp
2013-07-11 22:05:14 +03:00
Nikita Manovich
c55dc3e8ab Fixed "FileStorage (minor) error in doc (Feature #3151)"
It was just a typo in the documentation.
2013-07-11 16:06:25 +04:00
Alex Leontiev
e9b432b1d9 Fixing the warnings
Fixed all of the warnings.
2013-07-11 14:43:48 +03:00
Nikita Manovich
05aeb70831 Fixed VideoCapture::open() does not release previous capture sources (Bug #3150).
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
  bool VideoCapture::open(const string& filename);
  bool VideoCapture::open(int device);

The methods first call VideoCapture::release() to close the already opened file or camera.
2013-07-11 15:16:22 +04:00
Alex Leontiev
6c9ae1100b Fixed the warnings
Fixed the code so to eliminate warnings related to shadowing and unused
parameters. In some settings, these warnings may be treated as an errors
and lead to failed build.

Suggested by Nikita Manovich.
2013-07-11 12:29:55 +03:00
Andrey Pavlenko
75b86c9706 Merge pull request #1104 from nikman-ru:cap_reuse 2013-07-11 11:52:22 +04:00
Andrey Pavlenko
d1fe1a62c3 Merge pull request #1106 from pengx17:2.4_gftt_rename 2013-07-11 11:41:37 +04:00
Andrey Pavlenko
07c2ae508e Merge pull request #1102 from SpecLad:xls-updates 2013-07-11 11:36:47 +04:00
Alex Leontiev
fe6a7e935d Fix qualifiers on aux functions for solveLP()
Change qualifiers on auxiliary functions (for solveLP() procedure) from
const (that does not have much sense) to static (that makes them
invisible for outside world and hopefully exacerbates optimization).
2013-07-11 09:52:13 +03:00
Alex Leontiev
ba537a95db Preparation for pull request
Additional cleaning for simplex method, removing the parts that are
currently unused. Removing developer's notes. Trying to reach production
level.
2013-07-11 09:31:10 +03:00
Andrey Pavlenko
decd0c753a Merge pull request #1082 from jet47:gpu-warnings-fix 2013-07-11 09:41:46 +04:00
abidrahmank
1923d87f61 PyDocs for common interface of feature2d 2013-07-11 09:33:32 +05:30
abidrahmank
f91f369788 PyDocs for FAST, ORB etc 2013-07-11 09:32:49 +05:30
abidrahmank
2047838106 feature2d drawing functions PyDocs 2013-07-11 09:31:25 +05:30
abidrahmank
031c77f4eb SIFT+SURF PyDocs 2013-07-11 09:30:21 +05:30
abidrahmank
5d863f7516 drawMatches python bindings 2013-07-11 09:28:37 +05:30
kdrobnyh
df4b67a749 Merge pull request #1 from Itseez/2.4
Add calculating integral image using IPP
2013-07-10 10:45:24 -07:00
Alex Leontiev
a95650111f Cleaning the code of simplex method
In particular, the following things are done:
*) Consistent tabulation of 4 spaces is ensured
*) New function dprintf() is introduced, so now printing of the debug
information can be turned on/off via the ALEX_DEBUG macro
*) Removed solveLP_aux namespace
*) All auxiliary functions are declared as static
*) The return codes of solveLP() are encapsulated in enum.
2013-07-10 20:11:52 +03:00
Roman Donchenko
241e2d2360 Merge pull request #1077 from bitwangyaoyao:2.4_kmeans 2013-07-10 18:32:14 +04:00
Roman Donchenko
894b30b34d Merge pull request #1088 from apacha:brisk_noDescriptors_fix 2013-07-10 18:18:31 +04:00
Roman Donchenko
f0c7cce87a Merge pull request #1080 from hhofbaue:matchTemplate_bugfix 2013-07-10 18:17:06 +04:00
Nikita Manovich
21211308d0 Fixed VideoCapture::open() does not release previous capture sources (Bug #3150).
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
  bool VideoCapture::open(const string& filename);
  bool VideoCapture::open(int device);

The methods first call VideoCapture::release() to close the already opened file or camera.
2013-07-10 17:48:44 +04:00
Roman Donchenko
a0f6e1ba1d Merge pull request #1103 from apavlenko:ver_2.4.6.1 2013-07-10 15:49:00 +04:00
Andrey Pavlenko
2b2e02166e setting version to 2.4.6.1 (hot-fix release for Linux camera support) 2013-07-10 15:12:39 +04:00
Roman Donchenko
ea3239a00e xls-report.py: Added an option to show per-pixel times 2013-07-10 14:58:51 +04:00
Roman Donchenko
5b2dc26f2c Made the crude ability less crude. 2013-07-10 14:58:51 +04:00
Roman Donchenko
215b3e749f Added to the test log parser a crude ability to detect non-implemented tests. 2013-07-10 14:58:51 +04:00
Roman Donchenko
1080c4295a xls-report.py: removed image size and type from the list of other parameters.
Also, shrunk the corresponding column and the test name column.
2013-07-10 14:58:18 +04:00
Roman Donchenko
63d151a29c xls-report.py: add ability to specify arbitrary sheet properties 2013-07-10 14:58:17 +04:00
kdrobnyh
f8eb806565 Add IPP support to integral function 2013-07-10 11:25:36 +04:00
peng xiao
5032240c9d Fix ocl gftt file name typo. 2013-07-10 14:51:40 +08:00
Roman Donchenko
2dedfd9762 Merge pull request #1099 from asmorkalov:linux_vcap_fix 2013-07-09 17:13:05 +04:00
Alexander Smorkalov
f77d1f57ee V4L and V4L2 based Video capture bug fix (Bugfix #3144). 2013-07-09 16:07:55 +04:00
Roman Donchenko
b1f04c5388 Merge pull request #1097 from apavlenko:ocl_tests_fixes 2013-07-09 14:00:38 +04:00
Andrey Pavlenko
fcb4c0e51c fixing working with test data and a small fix for init code
- set init value for `numsdev` to prevent use of uninitialized value
- stop use of 'workdir' and files from samples
- forcing use of 'opencv_extra' instead
Note: set OPENCV_TEST_DATA_PATH to full path to 'opencv_extra/testdata' (gitolite@code.opencv.org:opencv_extra.git) before running the test!
2013-07-09 13:25:21 +04:00
Roman Donchenko
68a992b075 Merge pull request #1096 from SpecLad:merge-2.4 2013-07-09 11:50:19 +04:00
Roman Donchenko
c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/ocl/src/opencl/stereobp.cl
	modules/ocl/src/stereobp.cpp
2013-07-08 18:47:38 +04:00
Andrey Pavlenko
1a2458885b Merge pull request #1094 from asmorkalov:android_na_fix 2013-07-08 11:25:40 +04:00
andrey.morozov
8d0452ed59 added test to save image with webp with alpha channel 2013-07-06 17:26:22 +04:00
Alexander Smorkalov
69b308a368 Various fixes in android sample NativeActivity. 2013-07-05 14:08:37 +04:00
Roman Donchenko
f5089100b9 Merge pull request #1073 from asmorkalov:android_cvjavaframe 2013-07-05 13:41:51 +04:00
Roman Donchenko
de58039b46 Merge pull request #1081 from SpecLad:merge-2.4 2013-07-05 13:34:59 +04:00
Roman Donchenko
2f8be2a4b1 Merge pull request #1083 from jet47:cuda-device-layer 2013-07-05 13:30:11 +04:00
Roman Donchenko
c4e59866a2 Merge pull request #1074 from devernay:2.4-cap_qt-multithread 2013-07-05 13:28:38 +04:00
Andrey Pavlenko
b6b1d5e75d Merge pull request #1092 from asmorkalov:manager_version_inc 2013-07-05 13:02:10 +04:00
Roman Donchenko
36a4d246f4 Merge pull request #1087 from znah:2.4 2013-07-05 12:07:45 +04:00