Roman Donchenko [Mon, 15 Jul 2013 07:45:28 +0000 (11:45 +0400)]
Merge pull request #1068 from AoD314:webp2
andrey.morozov [Sat, 29 Jun 2013 18:01:02 +0000 (22:01 +0400)]
updated webp to version 0.3.1
andrey.morozov [Sat, 29 Jun 2013 18:00:26 +0000 (22:00 +0400)]
added support image with alpha channel
Roman Donchenko [Fri, 12 Jul 2013 07:40:33 +0000 (11:40 +0400)]
Merge pull request #1107 from abidrahmank:master
Roman Donchenko [Fri, 12 Jul 2013 07:39:24 +0000 (11:39 +0400)]
Merge pull request #1101 from jet47:cudev-stub-lib
Vladislav Vinogradov [Thu, 11 Jul 2013 07:50:02 +0000 (11:50 +0400)]
added stub library for cudev module
in order to make CMake scripts work properly
Andrey Pavlenko [Thu, 11 Jul 2013 07:52:22 +0000 (11:52 +0400)]
Merge pull request #1104 from nikman-ru:cap_reuse
Andrey Pavlenko [Thu, 11 Jul 2013 05:41:45 +0000 (09:41 +0400)]
Merge pull request #1082 from jet47:gpu-warnings-fix
abidrahmank [Thu, 11 Jul 2013 04:03:32 +0000 (09:33 +0530)]
PyDocs for common interface of feature2d
abidrahmank [Thu, 11 Jul 2013 04:02:49 +0000 (09:32 +0530)]
PyDocs for FAST, ORB etc
abidrahmank [Thu, 11 Jul 2013 04:01:25 +0000 (09:31 +0530)]
feature2d drawing functions PyDocs
abidrahmank [Thu, 11 Jul 2013 04:00:21 +0000 (09:30 +0530)]
SIFT+SURF PyDocs
abidrahmank [Thu, 11 Jul 2013 03:58:37 +0000 (09:28 +0530)]
drawMatches python bindings
Nikita Manovich [Wed, 10 Jul 2013 13:43:47 +0000 (17:43 +0400)]
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.
Roman Donchenko [Tue, 9 Jul 2013 07:50:19 +0000 (11:50 +0400)]
Merge pull request #1096 from SpecLad:merge-2.4
Roman Donchenko [Mon, 8 Jul 2013 14:47:38 +0000 (18:47 +0400)]
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
Andrey Pavlenko [Mon, 8 Jul 2013 07:25:40 +0000 (11:25 +0400)]
Merge pull request #1094 from asmorkalov:android_na_fix
andrey.morozov [Sat, 29 Jun 2013 17:59:25 +0000 (21:59 +0400)]
added test to save image with webp with alpha channel
Alexander Smorkalov [Fri, 5 Jul 2013 10:08:37 +0000 (14:08 +0400)]
Various fixes in android sample NativeActivity.
Roman Donchenko [Fri, 5 Jul 2013 09:41:51 +0000 (13:41 +0400)]
Merge pull request #1073 from asmorkalov:android_cvjavaframe
Roman Donchenko [Fri, 5 Jul 2013 09:34:58 +0000 (13:34 +0400)]
Merge pull request #1081 from SpecLad:merge-2.4
Roman Donchenko [Fri, 5 Jul 2013 09:30:11 +0000 (13:30 +0400)]
Merge pull request #1083 from jet47:cuda-device-layer
Roman Donchenko [Fri, 5 Jul 2013 09:28:38 +0000 (13:28 +0400)]
Merge pull request #1074 from devernay:2.4-cap_qt-multithread
Andrey Pavlenko [Fri, 5 Jul 2013 09:02:09 +0000 (13:02 +0400)]
Merge pull request #1092 from asmorkalov:manager_version_inc
Roman Donchenko [Fri, 5 Jul 2013 08:07:44 +0000 (12:07 +0400)]
Merge pull request #1087 from znah:2.4
Alexander Smorkalov [Fri, 5 Jul 2013 08:07:04 +0000 (12:07 +0400)]
OpenCV Manager version++.
Roman Donchenko [Fri, 5 Jul 2013 08:00:52 +0000 (12:00 +0400)]
Merge pull request #1091 from SpecLad:xls-updates
Roman Donchenko [Thu, 4 Jul 2013 15:59:26 +0000 (19:59 +0400)]
xls-report.py: make behaviour more intelligent in case of repeated results
Roman Donchenko [Thu, 4 Jul 2013 14:52:10 +0000 (18:52 +0400)]
xls-report.py: write tests in sorted order
Roman Donchenko [Thu, 4 Jul 2013 14:44:56 +0000 (18:44 +0400)]
xls-report.py: made most columns a little wider
Roman Donchenko [Thu, 4 Jul 2013 14:19:33 +0000 (18:19 +0400)]
xls-report.py: added an option to include data from unrecognized XMLs
Roman Donchenko [Thu, 4 Jul 2013 15:46:53 +0000 (19:46 +0400)]
Merge pull request #1090 from asmorkalov:android_tbb_downgrade
Alexander Smorkalov [Thu, 4 Jul 2013 14:51:17 +0000 (18:51 +0400)]
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.
Roman Donchenko [Thu, 4 Jul 2013 14:25:39 +0000 (18:25 +0400)]
Merge pull request #1089 from SpecLad:contract-violations
Roman Donchenko [Thu, 4 Jul 2013 14:03:03 +0000 (18:03 +0400)]
xls-report.py: don't eat all errors when reading sheet.conf
Alexander Mordvintsev [Thu, 4 Jul 2013 13:43:38 +0000 (17:43 +0400)]
line realign
Roman Donchenko [Thu, 4 Jul 2013 13:24:19 +0000 (17:24 +0400)]
Merge pull request #1085 from bitwangyaoyao:2.4_optBP
Roman Donchenko [Thu, 4 Jul 2013 13:23:53 +0000 (17:23 +0400)]
Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor
Roman Donchenko [Thu, 4 Jul 2013 13:09:29 +0000 (17:09 +0400)]
Fix bug: CommandLineParserParams's comparator would fail with equal arguments.
Roman Donchenko [Thu, 4 Jul 2013 13:06:00 +0000 (17:06 +0400)]
Fix bug: cv::String would break if assigned to itself.
Jin Ma [Thu, 4 Jul 2013 08:14:55 +0000 (16:14 +0800)]
Fix oclMat constructor when roi is provided.
yao [Thu, 4 Jul 2013 06:46:38 +0000 (14:46 +0800)]
optimize stereoBP kernel
Alexander Mordvintsev [Wed, 3 Jul 2013 18:26:18 +0000 (22:26 +0400)]
GFTT wrapped to python
Vladislav Vinogradov [Wed, 3 Jul 2013 18:21:10 +0000 (22:21 +0400)]
fixed warnings in gpu modules from VS 2012
Vladislav Vinogradov [Wed, 3 Jul 2013 13:31:41 +0000 (17:31 +0400)]
CUDA Device Layer:
header only library for CUDA programming
Roman Donchenko [Wed, 3 Jul 2013 15:53:21 +0000 (19:53 +0400)]
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
Frédéric Devernay [Tue, 2 Jul 2013 16:08:12 +0000 (18:08 +0200)]
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
Andrey Pavlenko [Tue, 2 Jul 2013 14:39:12 +0000 (18:39 +0400)]
Merge pull request #1047 from jet47:gpustream-remove-obsolete
Andrey Pavlenko [Tue, 2 Jul 2013 11:39:06 +0000 (15:39 +0400)]
Merge pull request #1046 from SpecLad:merge-2.4
Alexander Smorkalov [Tue, 2 Jul 2013 08:58:59 +0000 (12:58 +0400)]
JavaCameraView delivers same frame twice (Bug #3123) fixed.
Roman Donchenko [Mon, 1 Jul 2013 09:45:42 +0000 (13:45 +0400)]
Merge pull request #1051 from pengx17:2.4_fback_ocl
Roman Donchenko [Mon, 1 Jul 2013 09:21:12 +0000 (13:21 +0400)]
Merge pull request #1061 from bitwangyaoyao:2.4_fix2
Roman Donchenko [Mon, 1 Jul 2013 09:20:51 +0000 (13:20 +0400)]
Merge pull request #1060 from pengx17:2.4_setbinary_fix
Roman Donchenko [Mon, 1 Jul 2013 09:20:04 +0000 (13:20 +0400)]
Merge pull request #1055 from pengx17:2.4_ocl_hang_workaround
Andrey Pavlenko [Mon, 1 Jul 2013 08:10:57 +0000 (12:10 +0400)]
Merge pull request #1069 from apavlenko:fix_bin_compat_checker
Andrey Pavlenko [Mon, 1 Jul 2013 06:03:08 +0000 (10:03 +0400)]
adding 'ios.h' to ignore list should work on non-Mac)
Roman Donchenko [Fri, 28 Jun 2013 15:47:30 +0000 (19:47 +0400)]
Merge pull request #1067 from asmorkalov:android_service_readme
Roman Donchenko [Fri, 28 Jun 2013 15:32:44 +0000 (19:32 +0400)]
Merge pull request #1065 from apavlenko:fix_eclipse_warning
Roman Donchenko [Fri, 28 Jun 2013 15:08:12 +0000 (19:08 +0400)]
Merge pull request #1064 from asmorkalov:winrt_sample_fix
Alexander Smorkalov [Fri, 28 Jun 2013 14:25:53 +0000 (18:25 +0400)]
OpenCV Version++; Manager Version++
Andrey Pavlenko [Fri, 28 Jun 2013 13:28:57 +0000 (17:28 +0400)]
removing unused import
Alexander Smorkalov [Fri, 28 Jun 2013 12:48:27 +0000 (16:48 +0400)]
Path to OpenCV dll libs fixes.
Roman Donchenko [Fri, 28 Jun 2013 10:47:45 +0000 (14:47 +0400)]
Merge pull request #1059 from dominikrose:dc1394_2-1394b
Roman Donchenko [Fri, 28 Jun 2013 10:41:35 +0000 (14:41 +0400)]
Merge pull request #1063 from alekcac:conversion
Roman Donchenko [Fri, 28 Jun 2013 10:35:51 +0000 (14:35 +0400)]
Merge pull request #1062 from kirill-kornyakov:fixes-for-documentation
Roman Donchenko [Fri, 28 Jun 2013 10:26:45 +0000 (14:26 +0400)]
Merge pull request #1018 from jet47:cuda-5.5-arm
yao [Fri, 28 Jun 2013 09:45:39 +0000 (17:45 +0800)]
stereoBM fix an error on Linux when running full performance test
Alexander Shishkov [Fri, 28 Jun 2013 09:26:54 +0000 (13:26 +0400)]
added conversions between UIImage and cv::Mat
Kirill Kornyakov [Fri, 28 Jun 2013 08:48:12 +0000 (12:48 +0400)]
Removed references to opencv.itseez.com
Kirill Kornyakov [Fri, 28 Jun 2013 08:38:44 +0000 (12:38 +0400)]
Removed all references to trunk
yao [Fri, 28 Jun 2013 08:23:01 +0000 (16:23 +0800)]
warnings fix
Kirill Kornyakov [Fri, 28 Jun 2013 08:21:52 +0000 (12:21 +0400)]
Removed references to YG from samples
Kirill Kornyakov [Fri, 28 Jun 2013 08:15:14 +0000 (12:15 +0400)]
Completely get rid of opencv_group
Kirill Kornyakov [Fri, 28 Jun 2013 08:12:53 +0000 (12:12 +0400)]
Updated a couple of more links
Kirill Kornyakov [Fri, 28 Jun 2013 07:53:39 +0000 (11:53 +0400)]
updated email address
Kirill Kornyakov [Fri, 28 Jun 2013 07:51:40 +0000 (11:51 +0400)]
Mentioned 2.4 and master branches
Kirill Kornyakov [Thu, 13 Jun 2013 12:48:17 +0000 (16:48 +0400)]
Added link to contribution process, updated formatting
Alexander Shishkov [Thu, 4 Apr 2013 21:31:30 +0000 (01:31 +0400)]
changed contacts in tutorual
Roman Donchenko [Fri, 28 Jun 2013 07:29:54 +0000 (11:29 +0400)]
Merge pull request #1054 from asmorkalov:opencv_version
yao [Fri, 28 Jun 2013 07:08:39 +0000 (15:08 +0800)]
some tweaks to samples
yao [Fri, 28 Jun 2013 05:38:58 +0000 (13:38 +0800)]
more fix to HOG
yao [Fri, 28 Jun 2013 03:44:43 +0000 (11:44 +0800)]
format the ocl's samples name
yao [Fri, 28 Jun 2013 03:43:43 +0000 (11:43 +0800)]
some accuracy fix of HOG
peng xiao [Fri, 28 Jun 2013 02:52:39 +0000 (10:52 +0800)]
Move function definition from header to cpp.
peng xiao [Fri, 28 Jun 2013 02:39:09 +0000 (10:39 +0800)]
Renew function logic.
peng xiao [Fri, 28 Jun 2013 02:12:18 +0000 (10:12 +0800)]
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.
Dominik Rose [Thu, 27 Jun 2013 17:43:05 +0000 (19:43 +0200)]
Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
Dominik Rose [Thu, 27 Jun 2013 13:05:32 +0000 (15:05 +0200)]
dc1394-2: support for operation mode 1394b added
Roman Donchenko [Thu, 27 Jun 2013 12:59:25 +0000 (16:59 +0400)]
Merge pull request #1040 from asmorkalov:winrt
Roman Donchenko [Thu, 27 Jun 2013 12:29:56 +0000 (16:29 +0400)]
Merge pull request #1056 from asmorkalov:android_old_remove
Roman Donchenko [Thu, 27 Jun 2013 11:50:31 +0000 (15:50 +0400)]
Merge pull request #1057 from SpecLad:gtest-param-filter
Alexander Smorkalov [Thu, 27 Jun 2013 06:56:50 +0000 (23:56 -0700)]
Test fixes
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
Alexander Smorkalov [Wed, 26 Jun 2013 09:31:47 +0000 (02:31 -0700)]
TBB updated to version 4.1 update 4.
Roman Donchenko [Thu, 27 Jun 2013 11:37:42 +0000 (15:37 +0400)]
Merge pull request #1036 from jet47:fix-gpu-deviceinfo
Roman Donchenko [Wed, 26 Jun 2013 14:34:36 +0000 (18:34 +0400)]
Extended Google Test to allow filtering by parameter value.
Roman Donchenko [Thu, 27 Jun 2013 08:22:00 +0000 (12:22 +0400)]
Merge pull request #1050 from pengx17:2.4_clach_mod
Alexander Smorkalov [Wed, 26 Jun 2013 13:12:51 +0000 (17:12 +0400)]
OpenCV Library and Manager version incremented.
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
Roman Donchenko [Thu, 27 Jun 2013 08:03:07 +0000 (12:03 +0400)]
Merge pull request #1011 from wecacuee:master
Alexander Smorkalov [Thu, 27 Jun 2013 07:26:51 +0000 (11:26 +0400)]
Old android folder removed.
The changes must be applied after buildbot update only!
peng xiao [Thu, 27 Jun 2013 02:20:21 +0000 (10:20 +0800)]
Temporarily disable command queue release as it causes program hang at exit