Roman Donchenko
1acbc7b7bd
Merge pull request #966 from berak:master
12 years ago
Roman Donchenko
7a07f1a9e7
Merge pull request #899 from LeszekSwirski:fix-drawingdoc
12 years ago
Roman Donchenko
7c4e3715b3
Merge pull request #975 from SpecLad:merge-2.4
12 years ago
Roman Donchenko
81c6b46fc6
Merge pull request #974 from jet47:gpu-core-refactoring
12 years ago
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
12 years ago
Vladislav Vinogradov
4f0d72bf43
added missing <iostream> header
12 years ago
Vladislav Vinogradov
564fd21e87
fixed documentation build
12 years ago
Roman Donchenko
e16af9bdc9
Merge pull request #958 from apavlenko:fix_java_mixchannels
12 years ago
Vadim Pisarevsky
1fe7ad850b
Merge pull request #856 from ericgreveson:master
12 years ago
Andrey Pavlenko
438649ffee
fixing Java wrapper for mixChannels
...
'dst' should be treated as an input arg (epilog not needed)
12 years ago
Vladislav Vinogradov
439c3574ed
renamed gpu_private.hpp to private.gpu.hpp
12 years ago
Vladislav Vinogradov
0489489322
used cudaMalloc for 1-row or 1-column matrix instead of cudaMallocPitch
12 years ago
Vladislav Vinogradov
1db4afac6a
made createContinuous & ensureSizeIsEnough generic (OutputArray support)
12 years ago
Vladislav Vinogradov
f17b836d24
added Event class (wrapper for cudaEvent)
12 years ago
Vladislav Vinogradov
2dab93c2e8
refactored gpu info structures (TargetArchs and DeviceInfo)
...
now DeviceInfo provides full information about device (from cudaDeviceProp)
12 years ago
Vladislav Vinogradov
76f4b02b06
refactored gpu::Stream (minor fixes)
12 years ago
Vladislav Vinogradov
a52af84dcf
refactored CudaMem (now alloc type assign only in constructor)
12 years ago
Vladislav Vinogradov
cc34a8ac3c
new implementation for GpuMat::setTo (without constant memory)
12 years ago
Vladislav Vinogradov
69be49bac1
refactored GpuMat:
...
* switch to InputArray/OutputArray
* add Stream support
12 years ago
Vladislav Vinogradov
db1178b5df
moved GpuMat implementation to separate file
12 years ago
Vladislav Vinogradov
2153a14872
moved inline implementation to separate file
12 years ago
Vladislav Vinogradov
6994a02c15
added Stream support to ogl::Buffer
12 years ago
Vladislav Vinogradov
649737b6a8
removed obsolete DevMem2D class
12 years ago
Vladislav Vinogradov
4c9773d55f
renamed gpu headers (made it more consistent)
12 years ago
Vladislav Vinogradov
6c253a41c2
added CudaMem support to Input/Output arrays
12 years ago
Vladislav Vinogradov
2fae1d9507
removed ogl::Texture2D support from InputArray
12 years ago
Roman Donchenko
173442bb2e
Merge pull request #964 from jet47:cuda-5.5-support
12 years ago
berak
765a2c6045
Moments.nu** fields initialized in completeMomentState( Moments* moments )
12 years ago
berak
610e29fa31
restored utility.hpp
12 years ago
berak
50e27ffc37
added initialization of Moments.nu** params in completeMomentState( Moments* moments )
12 years ago
Vladislav Vinogradov
4559d46190
fixed BroxOpticalFlow sanity test (increase epsilon value)
12 years ago
Vladislav Vinogradov
4d9a1cf14b
fixed BoxFilter sanity test (different rounding results)
12 years ago
Vladislav Vinogradov
302250f241
fixed BroxOpticalFlow regression test
...
the output of BroxOpticalFlow differs a bit in CUDA 5.5
12 years ago
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
12 years ago
Vladislav Vinogradov
869a35faef
fixed constructors for functional objects (added __host__ modifier)
12 years ago
Vladislav Vinogradov
bf7c1c6c25
fixed NPP error constants usage
12 years ago
Roman Donchenko
c929547164
Merge pull request #900 from jet47:restore-gpu-modules
12 years ago
Vadim Pisarevsky
4cf7a963a0
Merge pull request #946 from bitwangyaoyao:2.4_samples2
12 years ago
Vadim Pisarevsky
51f81eec36
Merge pull request #957 from pengx17:2.4_fix_corner_detector
12 years ago
Vadim Pisarevsky
a5ffa1da34
Merge pull request #963 from bitwangyaoyao:master_oclMat
12 years ago
Vladislav Vinogradov
9488ed46ee
fixed compiler warning
...
removed -fvisibility-inlines-hidden compiler option for CUDA sources
12 years ago
Vladislav Vinogradov
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
12 years ago
Roman Donchenko
10340fe234
Merge pull request #949 from SpecLad:merge-2.4
12 years ago
yao
9284c07a84
remove commented lines
12 years ago
Roman Donchenko
68e4256fd2
Merge pull request #960 from SpecLad:extra-modules
12 years ago
Roman Donchenko
aa7f70c31e
Merge pull request #951 from apavlenko:fix_java_test_randshuffle
12 years ago
Roman Donchenko
9b46c6fb8a
Merge pull request #959 from SpecLad:qt4-build
12 years ago
yao
960a0eacf3
merge openCLMallocPitch and openCLMallocPitchEx into one interface
12 years ago
Roman Donchenko
e53b7d040c
Merge pull request #955 from SpecLad:symlink
12 years ago
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.
12 years ago