Roman Donchenko
a75fbb0031
Merge pull request #968 from asmorkalov:android_na_cproj_fix
2013-06-11 11:59:32 +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
Roman Donchenko
3016986833
Merge pull request #965 from apavlenko:fix_java_empty_mats
2013-06-10 15:04:16 +04: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
Roman Donchenko
173442bb2e
Merge pull request #964 from jet47:cuda-5.5-support
2013-06-10 12:05:52 +04:00
Alexander Smorkalov
a39a9f677f
NativeActivity sample build with Eclipse CDT fixed.
2013-06-10 11:06:28 +04: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
Roman Donchenko
33d1f67501
Include the OpenCV config headers into every module.
...
This has no bearing on compilation, but it makes them show up in IDEs.
2013-06-07 19:07:55 +04: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
4cf7a963a0
Merge pull request #946 from bitwangyaoyao:2.4_samples2
2013-06-07 13:44:29 +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
