Vladislav Vinogradov
6d6ff26887
refactored gpu::ImagePyramid (converted it to abstract interface)
12 years ago
Vladislav Vinogradov
2932beddcf
switched to Input/Output Array in gpuwarping functions
12 years ago
Andrey Pavlenko
75b86c9706
Merge pull request #1104 from nikman-ru:cap_reuse
12 years ago
Andrey Pavlenko
decd0c753a
Merge pull request #1082 from jet47:gpu-warnings-fix
12 years ago
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.
12 years ago
Roman Donchenko
68a992b075
Merge pull request #1096 from SpecLad:merge-2.4
12 years ago
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
12 years ago
Andrey Pavlenko
1a2458885b
Merge pull request #1094 from asmorkalov:android_na_fix
12 years ago
Alexander Smorkalov
69b308a368
Various fixes in android sample NativeActivity.
12 years ago
Roman Donchenko
f5089100b9
Merge pull request #1073 from asmorkalov:android_cvjavaframe
12 years ago
Roman Donchenko
de58039b46
Merge pull request #1081 from SpecLad:merge-2.4
12 years ago
Roman Donchenko
2f8be2a4b1
Merge pull request #1083 from jet47:cuda-device-layer
12 years ago
Roman Donchenko
c4e59866a2
Merge pull request #1074 from devernay:2.4-cap_qt-multithread
12 years ago
Andrey Pavlenko
b6b1d5e75d
Merge pull request #1092 from asmorkalov:manager_version_inc
12 years ago
Roman Donchenko
36a4d246f4
Merge pull request #1087 from znah:2.4
12 years ago
Alexander Smorkalov
e905c81ccc
OpenCV Manager version++.
12 years ago
Roman Donchenko
dbf02c71b6
Merge pull request #1091 from SpecLad:xls-updates
12 years ago
Roman Donchenko
2b44172026
xls-report.py: make behaviour more intelligent in case of repeated results
12 years ago
Roman Donchenko
0732905cff
xls-report.py: write tests in sorted order
12 years ago
Roman Donchenko
ea054e2888
xls-report.py: made most columns a little wider
12 years ago
Roman Donchenko
4e939e2fce
xls-report.py: added an option to include data from unrecognized XMLs
12 years ago
Roman Donchenko
ec1df9f54d
Merge pull request #1090 from asmorkalov:android_tbb_downgrade
12 years ago
Alexander Smorkalov
c2e6668414
Bug #3124 libopencv_java.so v 2.4.6 hangs on some Android 4.0.3 devices fixed.
...
Downgrade TBB to 4.1u2 for all platforms, except WinRT.
12 years ago
Roman Donchenko
4d45b3e7f9
Merge pull request #1089 from SpecLad:contract-violations
12 years ago
Roman Donchenko
83fd385bbd
xls-report.py: don't eat all errors when reading sheet.conf
12 years ago
Alexander Mordvintsev
3677a66403
line realign
12 years ago
Roman Donchenko
a2d576c1bb
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
12 years ago
Roman Donchenko
4d569732b9
Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
12 years ago
Roman Donchenko
0daf4b800a
Fix bug: CommandLineParserParams's comparator would fail with equal arguments.
12 years ago
Roman Donchenko
4692d4b36e
Fix bug: cv::String would break if assigned to itself.
12 years ago
Jin Ma
97e620b8f3
Fix oclMat constructor when roi is provided.
12 years ago
yao
f2333e90f6
optimize stereoBP kernel
12 years ago
Alexander Mordvintsev
8045093cfb
GFTT wrapped to python
12 years ago
Vladislav Vinogradov
b4d95b1406
fixed warnings in gpu modules from VS 2012
12 years ago
Vladislav Vinogradov
31d55af9c1
CUDA Device Layer:
...
header only library for CUDA programming
12 years ago
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
12 years ago
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
12 years ago
Andrey Pavlenko
70deda354a
Merge pull request #1047 from jet47:gpustream-remove-obsolete
12 years ago
Andrey Pavlenko
89086bdb8d
Merge pull request #1046 from SpecLad:merge-2.4
12 years ago
Alexander Smorkalov
91b713b8c9
JavaCameraView delivers same frame twice (Bug #3123 ) fixed.
12 years ago
Roman Donchenko
6bf8f474fa
Merge pull request #1051 from pengx17:2.4_fback_ocl
12 years ago
Roman Donchenko
c8cd2cf601
Merge pull request #1061 from bitwangyaoyao:2.4_fix2
12 years ago
Roman Donchenko
087bab6ceb
Merge pull request #1060 from pengx17:2.4_setbinary_fix
12 years ago
Roman Donchenko
38cf0a692e
Merge pull request #1055 from pengx17:2.4_ocl_hang_workaround
12 years ago
Andrey Pavlenko
a4c38196bc
Merge pull request #1069 from apavlenko:fix_bin_compat_checker
12 years ago
Andrey Pavlenko
97b939195f
adding 'ios.h' to ignore list should work on non-Mac)
12 years ago
Roman Donchenko
eedc032b98
Merge pull request #1067 from asmorkalov:android_service_readme
12 years ago
Roman Donchenko
43632bf973
Merge pull request #1065 from apavlenko:fix_eclipse_warning
12 years ago
Roman Donchenko
d60cb1d00a
Merge pull request #1064 from asmorkalov:winrt_sample_fix
12 years ago
Alexander Smorkalov
8b6f1d9bd9
OpenCV Version++; Manager Version++
12 years ago