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
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
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
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
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
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
Roman Donchenko
173442bb2e
Merge pull request #964 from jet47:cuda-5.5-support
2013-06-10 12:05:52 +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
Vladislav Vinogradov
9488ed46ee
fixed compiler warning
...
removed -fvisibility-inlines-hidden compiler option for CUDA sources
2013-06-07 13:34:33 +04:00
Vladislav Vinogradov
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
2013-06-07 13:05:39 +04:00
Roman Donchenko
10340fe234
Merge pull request #949 from SpecLad:merge-2.4
2013-06-07 12:45:03 +04:00
yao
9284c07a84
remove commented lines
2013-06-07 15:31:12 +08:00
Roman Donchenko
68e4256fd2
Merge pull request #960 from SpecLad:extra-modules
2013-06-07 11:29:40 +04:00
Roman Donchenko
aa7f70c31e
Merge pull request #951 from apavlenko:fix_java_test_randshuffle
2013-06-07 11:28:10 +04:00
Roman Donchenko
9b46c6fb8a
Merge pull request #959 from SpecLad:qt4-build
2013-06-07 11:27:46 +04:00
yao
960a0eacf3
merge openCLMallocPitch and openCLMallocPitchEx into one interface
2013-06-07 15:27:44 +08:00
Roman Donchenko
e53b7d040c
Merge pull request #955 from SpecLad:symlink
2013-06-06 17:58:15 +04:00
Roman Donchenko
8714cbac91
Fix a missing header path when building with Qt 4.
...
Also, removing explicit include path configuration,
since QT_USE_FILE takes care of that.
2013-06-06 14:09:33 +04:00
Roman Donchenko
0a42a3eb06
Merge pull request #956 from IanVS:COLOR_CODE
2013-06-06 12:09:41 +04:00
peng xiao
429f84e59e
Fix a bug of cornerHarris and cornerMinEigenVal.
...
The bug is a buffer overrun when border type is reflect101.
It is found that gfft crashed with input of size 100x100 on Intel CPU.
2013-06-06 11:44:35 +08:00
