mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-03 16:35:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,777 Commits 6 Branches 126 Tags 3 GiB
919f35644e
Commit Graph

6009 Commits

Author SHA1 Message Date
Ivan Korolev
58fa401b4d Fixed a bug #2405 2013-06-14 10:43:20 +04:00
Ivan Korolev
fc82150edc Fixed a bug #2892 2013-06-14 08:21:42 +04:00
Peter Minin
7d70399d72 Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods 2013-06-14 04:25:17 +04:00
Gabe Schwartz
bb209193c9 Updated usage of METH_X definitions for python 3. 
Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
bce1b352e7 Updated cmake files to use print(). 
In these cases, just using print() is enough to ensure py2/3
compatibility.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
fb9781b97b Updated cv2.cpp to support Python 3 API. 
Added a header with defines to enable the module to compile with either
python 2 or 3 without changes.
 2013-06-13 20:10:01 -04:00
Gabe Schwartz
931ebab822 Updated generator and parser to support Python 3. 2013-06-13 18:39:47 -04:00
Sergei Nosov
c90abb6a03 add multiruns to fix "unreliable results" error 2013-06-13 21:14:42 +04:00
Roman Donchenko
8fa1e756e2 Merge pull request #993 from ivan-korolev:fix_videostab_bug_3023 2013-06-13 16:57:12 +04:00
Roman Donchenko
b725cbf73f Merge pull request #986 from pengx17:2.4_initiated_context 2013-06-13 16:55:56 +04:00
Roman Donchenko
5bb6d36684 Merge pull request #982 from pengx17:2.4_fix_two_bugs 2013-06-13 16:55:12 +04:00
Roman Donchenko
462047d1e4 Merge pull request #981 from SeninAndrew:ximea_camera_support_fix 2013-06-13 16:54:45 +04:00
Vladislav Vinogradov
0367a7f992 link with nvcuvenc and ffmpeg libraries only if WITH_NVCUVID is enabled 2013-06-13 16:46:34 +04:00
Alexander Smorkalov
37b67fa50d Fix compiler error due to missing pthread header (Issue #2953) 2013-06-13 16:11:39 +04:00
Ivan Korolev
de4c3f0178 Fixed a bug related to video stabilization crashes with a blank video (Bug #3023) 2013-06-13 13:41:43 +04:00
Dirk Van Haerenborgh
30f7f9717f allow for arbitraty number of sources and sinks 2013-06-13 11:16:33 +02:00
Alexander Smorkalov
83e9b0a87a Javadoc waring fix. 2013-06-13 12:40:14 +04:00
Roman Donchenko
6faf00b8e5 Merge pull request #696 from znah:detect_method 2013-06-13 12:01:59 +04:00
Vladislav Vinogradov
e433145b7e fix for Bug #3085: 
weights array is only allocated for (l_count+1) elements,
but then weights[l_count+1] element is accessed.
 2013-06-13 10:22:56 +04:00
peng xiao
5fd724b54a Add a function to query if global OpenCL context is initialized. 2013-06-13 10:46:12 +08:00
Dirk Van Haerenborgh
6d66d11046 gstreamer: cleaning up resources 2013-06-12 16:58:16 +02:00
Peng Xiao
d9ab22e4ed Fix two bugs related to opencl context. 
1. As getDevice will implicitly call setDevice, in getContext we should not need to call it again.
2. Fix an incorrect type casting.
 2013-06-12 13:55:20 +08:00
Andrew Senin
8eb6decb25 Fixed Ximea cameras support 2013-06-11 21:17:31 +04:00
Roman Donchenko
98f6a4a615 Merge pull request #972 from jet47:mog2-params-bug-2168 2013-06-11 18:21:52 +04:00
Roman Donchenko
572cfc99a8 Merge pull request #973 from pengx17:2.4_oclclahe 2013-06-11 18:17:57 +04:00
Roman Donchenko
1acbc7b7bd Merge pull request #966 from berak:master 2013-06-11 18:17:07 +04:00
Vladislav Vinogradov
a3341006ee updated documentation 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
8461cb3f4b refactored gpu::convolve function: 
* converted it to Algorithm
* old API still can be used for source compatibility (marked as deprecated)
 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
26a4be89b1 switched to Input/Output Array in Fourier operations 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
948661d722 switched to Input/Output Array in gpu::gemm 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
8fcef225fb switched to Input/Output Array in reductions operations 2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
c52d56964c switched to Input/Output Array in gpu::copyMakeBorder 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
539f367d0b refactored gpu::LUT function: 
* converted it to Algorithm, because implementation uses inner buffers and
  requires preprocessing step
* new implementation splits preprocessing and transform,
  what is more effecient
* old API still can be used for source compatibility (marked as deprecated)
 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
0c50d0821f switched to Input/Output Array in transpose/flip operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
3d8ca010b7 switched to Input/Output Array in split/merge operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
58c4d0eaeb switched to Input/Output Array in cart<->polar operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
0a83817ace switched to Input/Output Array in gpu::threshold 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
44ec450b53 switched to Input/Output Array in gpu::addWeighted 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
ec70282bf7 switched to Input/Output Array in min/max operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
f2aa6ebe15 switched to Input/Output Array in shift operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
d81f54db0b switched to Input/Output Array in bitwise logical operations 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
04a1a6dd8f switched to Input/Output Array in gpu::compare 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
b866890b27 switched to Input/Output Array in abs, sqr, sqrt, exp, log, pow 2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
5ec8c51b98 switched to Input/Output Array in gpu::absdiff 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
3ee12cbeb4 switched to Input/Output Array in gpu::divide 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
4595e3aa3e switched to Input/Output Array in gpu::multiply 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
ffa25be3d2 added arithm_op function to reduce code duplication 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
5330faf5a0 switched to Input/Output Array in gpu::subtract 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
4ebbf69134 switched to Input/Output Array in gpu::add 2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
76211709a3 refactored VideoReader (convert it to abstract interface) 
also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
 2013-06-11 17:57:40 +04:00
Vladislav Vinogradov
e9a74c17f8 refactored VideoWriter class (convert it to abstract interface) 2013-06-11 17:57:39 +04:00
Roman Donchenko
3af21cad4c Merge pull request #903 from aks2:2.4 2013-06-11 17:35:39 +04:00
Roman Donchenko
7a07f1a9e7 Merge pull request #899 from LeszekSwirski:fix-drawingdoc 2013-06-11 17:30:19 +04:00
Roman Donchenko
7c4e3715b3 Merge pull request #975 from SpecLad:merge-2.4 2013-06-11 17:28:26 +04:00
Peng Xiao
c8398c9fdc Use anonymous enumerations instead of constants 2013-06-11 20:32:55 +08:00
Roman Donchenko
81c6b46fc6 Merge pull request #974 from jet47:gpu-core-refactoring 2013-06-11 12:05:56 +04:00
Roman Donchenko
3bfc69740b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
 2013-06-10 18:18:01 +04:00
Vladislav Vinogradov
4f0d72bf43 added missing <iostream> header 2013-06-10 17:47:55 +04:00
Roman Donchenko
d583a79869 Revert "Add a variant of detectMultiScale with an argument 'weights'" 
It was merged by mistake.

This reverts commit ab6be9b7b7.
 2013-06-10 17:06:34 +04:00
Vladislav Vinogradov
564fd21e87 fixed documentation build 2013-06-10 15:52:01 +04:00
Roman Donchenko
e16af9bdc9 Merge pull request #958 from apavlenko:fix_java_mixchannels 2013-06-10 15:51:30 +04:00
Vadim Pisarevsky
1fe7ad850b Merge pull request #856 from ericgreveson:master 2013-06-10 15:25:09 +04:00
Vadim Pisarevsky
52e9974431 Merge pull request #961 from PeterMinin:detected_objects_weight 2013-06-10 15:22:46 +04:00
Roman Donchenko
1b689a7431 Merge pull request #971 from SpecLad:matchers-ctor 2013-06-10 15:06:31 +04:00
Roman Donchenko
55e83b8d18 Merge pull request #970 from asmorkalov:dshow_valid_check_fix 2013-06-10 15:06:14 +04:00
Alexander Smorkalov
956d8027ef Bug #3044 cap_dshow.cpp forgotten validity check fixed. 2013-06-10 13:29:45 -07:00
Peng Xiao
1d8cd3a717 Add ocl CLACH implementation. 
Test cases (accuracy and performance) are provided.
 2013-06-10 18:37:48 +08:00
Andrey Pavlenko
438649ffee fixing Java wrapper for mixChannels 
'dst' should be treated as an input arg (epilog not needed)
 2013-06-10 14:37:01 +04:00
Vladislav Vinogradov
99a5b3417a added missing BackgroundSubtractorMOG2 parameters 2013-06-10 13:41:46 +04:00
Roman Donchenko
41482fe56c Erase MatchPairsBody's copy constructor. 
It's the same as the implicitly defined one, and it causes a -Wextra warning
(not initializing the base class in a copy constructor).
 2013-06-10 13:30:23 +04:00
Vladislav Vinogradov
439c3574ed renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
0489489322 used cudaMalloc for 1-row or 1-column matrix instead of cudaMallocPitch 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
1db4afac6a made createContinuous & ensureSizeIsEnough generic (OutputArray support) 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
f17b836d24 added Event class (wrapper for cudaEvent) 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
2dab93c2e8 refactored gpu info structures (TargetArchs and DeviceInfo) 
now DeviceInfo provides full information about device (from cudaDeviceProp)
 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
76f4b02b06 refactored gpu::Stream (minor fixes) 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
a52af84dcf refactored CudaMem (now alloc type assign only in constructor) 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
cc34a8ac3c new implementation for GpuMat::setTo (without constant memory) 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
69be49bac1 refactored GpuMat: 
* switch to InputArray/OutputArray
* add Stream support
 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
db1178b5df moved GpuMat implementation to separate file 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
2153a14872 moved inline implementation to separate file 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
6994a02c15 added Stream support to ogl::Buffer 2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
649737b6a8 removed obsolete DevMem2D class 2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
4c9773d55f renamed gpu headers (made it more consistent) 2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
6c253a41c2 added CudaMem support to Input/Output arrays 2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
2fae1d9507 removed ogl::Texture2D support from InputArray 2013-06-10 12:40:30 +04:00
Peng Xiao
e77abeef16 Add a new global function to control ocl binary storage 
Previously the feature is controlled by setBinpath implicitly.
We add the function to cope with setBinpath and setBinpath is only
useful when setBinaryDiskCache is set.
Refer to the header to see more info.
 2013-06-10 16:38:22 +08:00
Andrey Pavlenko
264d26e671 fixing empty Mat case 2013-06-08 12:41:57 +04:00
berak
765a2c6045 Moments.nu** fields initialized in completeMomentState( Moments* moments ) 2013-06-07 18:29:00 +02:00
berak
610e29fa31 restored utility.hpp 2013-06-07 18:13:15 +02:00
berak
50e27ffc37 added initialization of Moments.nu** params in completeMomentState( Moments* moments ) 2013-06-07 17:22:42 +02:00
Vladislav Vinogradov
4559d46190 fixed BroxOpticalFlow sanity test (increase epsilon value) 2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
4d9a1cf14b fixed BoxFilter sanity test (different rounding results) 2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
302250f241 fixed BroxOpticalFlow regression test 
the output of BroxOpticalFlow differs a bit in CUDA 5.5
 2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
14e4b3adde rewrite core/cuda/vec_math.hpp file 
old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp
 2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
869a35faef fixed constructors for functional objects (added __host__ modifier) 2013-06-07 16:32:43 +04:00
Vladislav Vinogradov
bf7c1c6c25 fixed NPP error constants usage 2013-06-07 16:32:43 +04:00
Roman Donchenko
c929547164 Merge pull request #900 from jet47:restore-gpu-modules 2013-06-07 14:33:35 +04:00
Vadim Pisarevsky
51f81eec36 Merge pull request #957 from pengx17:2.4_fix_corner_detector 2013-06-07 13:44:10 +04:00
Vadim Pisarevsky
a5ffa1da34 Merge pull request #963 from bitwangyaoyao:master_oclMat 2013-06-07 13:43:51 +04:00