mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,966 Commits 6 Branches 126 Tags 3 GiB
3d3e9ab635
Commit Graph

8966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yao
3d3e9ab635 Fix the problem of haar caused by merge 2013-07-22 17:53:56 +08:00
Roman Donchenko
616dbd53f0 Merge pull request #1107 from abidrahmank:master 2013-07-12 11:40:33 +04:00
Roman Donchenko
3b8a13a1ed Merge pull request #1101 from jet47:cudev-stub-lib 2013-07-12 11:39:25 +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
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
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
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
Alexander Smorkalov
e905c81ccc OpenCV Manager version++. 2013-07-05 12:07:04 +04:00
Roman Donchenko
dbf02c71b6 Merge pull request #1091 from SpecLad:xls-updates 2013-07-05 12:00:52 +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
ec1df9f54d Merge pull request #1090 from asmorkalov:android_tbb_downgrade 2013-07-04 19:46:53 +04:00
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.
 2013-07-04 18:52:52 +04:00
Roman Donchenko
4d45b3e7f9 Merge pull request #1089 from SpecLad:contract-violations 2013-07-04 18:25:39 +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
4d569732b9 Merge pull request #1086 from melody-rain:2.4_fix_oclMat_constructor 2013-07-04 17:23:53 +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
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