Daniel Angelov
e51e00ac5f
Added LSD accuracy tests.
2013-07-13 04:09:28 +03:00
Daniel Angelov
5350a2f1d9
Added Line Segmen Detector.
2013-07-13 00:21:02 +03: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
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
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
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
Alexander Smorkalov
91b713b8c9
JavaCameraView delivers same frame twice (Bug #3123 ) fixed.
2013-07-02 12:58:59 +04:00
Roman Donchenko
6bf8f474fa
Merge pull request #1051 from pengx17:2.4_fback_ocl
2013-07-01 13:45:43 +04:00
Roman Donchenko
c8cd2cf601
Merge pull request #1061 from bitwangyaoyao:2.4_fix2
2013-07-01 13:21:12 +04:00
Roman Donchenko
087bab6ceb
Merge pull request #1060 from pengx17:2.4_setbinary_fix
2013-07-01 13:20:51 +04:00
Roman Donchenko
38cf0a692e
Merge pull request #1055 from pengx17:2.4_ocl_hang_workaround
2013-07-01 13:20:04 +04:00
Roman Donchenko
43632bf973
Merge pull request #1065 from apavlenko:fix_eclipse_warning
2013-06-28 19:32:44 +04:00
Andrey Pavlenko
6069967109
removing unused import
2013-06-28 17:28:57 +04:00
Roman Donchenko
4b51b1e3a8
Merge pull request #1059 from dominikrose:dc1394_2-1394b
2013-06-28 14:47:45 +04:00
Roman Donchenko
1707b1769f
Merge pull request #1063 from alekcac:conversion
2013-06-28 14:41:35 +04:00
Roman Donchenko
a96466a73a
Merge pull request #1062 from kirill-kornyakov:fixes-for-documentation
2013-06-28 14:35:51 +04:00
Roman Donchenko
156155addb
Merge pull request #1018 from jet47:cuda-5.5-arm
2013-06-28 14:26:45 +04:00
yao
c66e27d49e
stereoBM fix an error on Linux when running full performance test
2013-06-28 17:45:39 +08:00
Alexander Shishkov
7b06592dea
added conversions between UIImage and cv::Mat
2013-06-28 13:26:54 +04:00
Kirill Kornyakov
aef347e7b3
Removed references to opencv.itseez.com
2013-06-28 12:48:12 +04:00
Kirill Kornyakov
cbed07bc18
Removed references to YG from samples
2013-06-28 12:21:52 +04:00
Roman Donchenko
3b78fe2684
Merge pull request #1054 from asmorkalov:opencv_version
2013-06-28 11:29:55 +04:00
yao
c1a59b8d80
more fix to HOG
2013-06-28 13:38:58 +08:00
yao
f1d9680ba8
format the ocl's samples name
2013-06-28 11:44:43 +08:00
yao
587fb4940d
some accuracy fix of HOG
2013-06-28 11:43:43 +08:00
peng xiao
a5383b8627
Move function definition from header to cpp.
2013-06-28 10:52:39 +08:00
peng xiao
e858a6c347
Renew function logic.
2013-06-28 10:39:09 +08:00
peng xiao
14dd345cdf
Fix ocl::setBinaryDiskCache
...
Previously the function requires Info::Impl implicitly. A call will create
new Context this function which is not intended.
The properties are now moved to global scope to fix this issue.
2013-06-28 10:12:18 +08:00
Dominik Rose
d39aeeca0f
Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
2013-06-27 19:43:05 +02:00
Dominik Rose
e32700cf8f
dc1394-2: support for operation mode 1394b added
2013-06-27 15:05:32 +02:00
Roman Donchenko
d76468c223
Merge pull request #1040 from asmorkalov:winrt
2013-06-27 16:59:25 +04:00