Roman Donchenko
4f68212e64
Merge pull request #1124 from SpecLad:matx-div
2013-07-17 13:32:26 +04:00
Roman Donchenko
8f2047ada4
Merge pull request #1093 from jet47:fix-gpu-stream-test
2013-07-17 13:18:25 +04:00
Roman Donchenko
1160b04fb4
Fixed a build warning in softcascade.
2013-07-16 12:43:49 +04:00
Roman Donchenko
924fc070f0
Changed / for Matx to Matx::div, for symmetry with Matx::mul.
2013-07-16 12:25:26 +04:00
Roman Donchenko
3443fd85cd
Merge pull request #984 from albenoit:master
2013-07-16 11:57:52 +04:00
alexandre benoit
12f65c61a8
updated doc wrt new bioinspired namespace convention
2013-07-15 09:58:16 +02:00
Roman Donchenko
52a9378257
Merge pull request #979 from jet47:gpuwarping-refactoring
2013-07-15 11:47:03 +04:00
Roman Donchenko
1590a1a538
Merge pull request #1068 from AoD314:webp2
2013-07-15 11:45:28 +04:00
alexandre benoit
7fe78efda3
retina included in namespace bioinspired + followed suggestions made by Vadim
2013-07-14 19:28:37 +02:00
andrey.morozov
e4e0862c2e
added support image with alpha channel
2013-07-13 14:09:37 +04:00
Roman Donchenko
616dbd53f0
Merge pull request #1107 from abidrahmank:master
2013-07-12 11:40:33 +04:00
Vladislav Vinogradov
d52ef2f758
added stub library for cudev module
...
in order to make CMake scripts work properly
2013-07-12 08:47:12 +04:00
Vladislav Vinogradov
5e3934446d
fixed test compilation for gpu::Stream
2013-07-12 08:45:55 +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
Andrey Pavlenko
75b86c9706
Merge pull request #1104 from nikman-ru:cap_reuse
2013-07-11 11:52:22 +04: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
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
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.morozov
8d0452ed59
added test to save image with webp with alpha channel
2013-07-06 17:26:22 +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
Roman Donchenko
36a4d246f4
Merge pull request #1087 from znah:2.4
2013-07-05 12:07:45 +04:00
Roman Donchenko
2b44172026
xls-report.py: make behaviour more intelligent in case of repeated results
2013-07-04 20:01:27 +04:00
Roman Donchenko
0732905cff
xls-report.py: write tests in sorted order
2013-07-04 20:01:27 +04:00
Roman Donchenko
ea054e2888
xls-report.py: made most columns a little wider
2013-07-04 20:01:27 +04:00
Roman Donchenko
4e939e2fce
xls-report.py: added an option to include data from unrecognized XMLs
2013-07-04 20:00:59 +04:00
alexandre benoit
188f889949
Merge branch 'master' of code.opencv.org:opencv
2013-07-04 16:19:24 +02:00
Roman Donchenko
83fd385bbd
xls-report.py: don't eat all errors when reading sheet.conf
2013-07-04 18:03:03 +04:00
Alexander Mordvintsev
3677a66403
line realign
2013-07-04 17:43:38 +04:00
Roman Donchenko
a2d576c1bb
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
2013-07-04 17:24:21 +04:00
Roman Donchenko
0daf4b800a
Fix bug: CommandLineParserParams's comparator would fail with equal arguments.
2013-07-04 17:09:29 +04:00
Roman Donchenko
4692d4b36e
Fix bug: cv::String would break if assigned to itself.
2013-07-04 17:06:00 +04:00
Jin Ma
97e620b8f3
Fix oclMat constructor when roi is provided.
2013-07-04 16:14:55 +08:00
yao
f2333e90f6
optimize stereoBP kernel
2013-07-04 14:46:38 +08:00
Alexander Mordvintsev
8045093cfb
GFTT wrapped to python
2013-07-03 22:26:18 +04:00
Vladislav Vinogradov
b4d95b1406
fixed warnings in gpu modules from VS 2012
2013-07-03 22:21:10 +04:00
Vladislav Vinogradov
31d55af9c1
CUDA Device Layer:
...
header only library for CUDA programming
2013-07-03 21:32:15 +04:00
Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Frédéric Devernay
b524e275c1
allow QtKit capture in secondary threads
...
[NSRunLoop currentRunLoop] is not the same as in the main thread.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"
The old code caused grabFrame() to return immediately if the capture
was not done in the main thread.
This code works correctly, even in secondary threads, provided that all
capture functions are called in the *same* thread
2013-07-02 18:08:12 +02:00
Andrey Pavlenko
70deda354a
Merge pull request #1047 from jet47:gpustream-remove-obsolete
2013-07-02 18:39:12 +04:00
Andrey Pavlenko
89086bdb8d
Merge pull request #1046 from SpecLad:merge-2.4
2013-07-02 15:39:07 +04:00
