alexandre benoit [Wed, 12 Jun 2013 20:43:36 +0000 (22:43 +0200)]
updated demos and tutorial regarding the Retina class transfer to bioinspired module.
alexandre benoit [Wed, 12 Jun 2013 20:40:43 +0000 (22:40 +0200)]
1. created module bioinspired. 2.transfered Retina module into the new module bioinspired. 3. added a fast tone mapping method to Retina interface and wrapped existing reinafilter dedicated method
Roman Donchenko [Tue, 11 Jun 2013 14:17:07 +0000 (18:17 +0400)]
Merge pull request #966 from berak:master
Roman Donchenko [Tue, 11 Jun 2013 13:30:16 +0000 (17:30 +0400)]
Merge pull request #899 from LeszekSwirski:fix-drawingdoc
Roman Donchenko [Tue, 11 Jun 2013 13:28:26 +0000 (17:28 +0400)]
Merge pull request #975 from SpecLad:merge-2.4
Roman Donchenko [Tue, 11 Jun 2013 08:05:56 +0000 (12:05 +0400)]
Merge pull request #974 from jet47:gpu-core-refactoring
Roman Donchenko [Mon, 10 Jun 2013 14:18:01 +0000 (18:18 +0400)]
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
Vladislav Vinogradov [Mon, 10 Jun 2013 13:47:55 +0000 (17:47 +0400)]
added missing <iostream> header
Vladislav Vinogradov [Mon, 10 Jun 2013 11:52:01 +0000 (15:52 +0400)]
fixed documentation build
Roman Donchenko [Mon, 10 Jun 2013 11:51:29 +0000 (15:51 +0400)]
Merge pull request #958 from apavlenko:fix_java_mixchannels
Vadim Pisarevsky [Mon, 10 Jun 2013 11:25:07 +0000 (15:25 +0400)]
Merge pull request #856 from ericgreveson:master
Andrey Pavlenko [Mon, 10 Jun 2013 10:37:01 +0000 (14:37 +0400)]
fixing Java wrapper for mixChannels
'dst' should be treated as an input arg (epilog not needed)
Vladislav Vinogradov [Thu, 30 May 2013 07:11:40 +0000 (11:11 +0400)]
renamed gpu_private.hpp to private.gpu.hpp
Vladislav Vinogradov [Thu, 30 May 2013 09:11:32 +0000 (13:11 +0400)]
used cudaMalloc for 1-row or 1-column matrix instead of cudaMallocPitch
Vladislav Vinogradov [Fri, 26 Apr 2013 06:53:15 +0000 (10:53 +0400)]
made createContinuous & ensureSizeIsEnough generic (OutputArray support)
Vladislav Vinogradov [Tue, 23 Apr 2013 13:11:45 +0000 (17:11 +0400)]
added Event class (wrapper for cudaEvent)
Vladislav Vinogradov [Tue, 16 Apr 2013 13:44:19 +0000 (17:44 +0400)]
refactored gpu info structures (TargetArchs and DeviceInfo)
now DeviceInfo provides full information about device (from cudaDeviceProp)
Vladislav Vinogradov [Tue, 16 Apr 2013 13:43:49 +0000 (17:43 +0400)]
refactored gpu::Stream (minor fixes)
Vladislav Vinogradov [Tue, 16 Apr 2013 10:39:42 +0000 (14:39 +0400)]
refactored CudaMem (now alloc type assign only in constructor)
Vladislav Vinogradov [Tue, 16 Apr 2013 09:17:51 +0000 (13:17 +0400)]
new implementation for GpuMat::setTo (without constant memory)
Vladislav Vinogradov [Tue, 16 Apr 2013 09:03:34 +0000 (13:03 +0400)]
refactored GpuMat:
* switch to InputArray/OutputArray
* add Stream support
Vladislav Vinogradov [Tue, 16 Apr 2013 07:12:55 +0000 (11:12 +0400)]
moved GpuMat implementation to separate file
Vladislav Vinogradov [Mon, 15 Apr 2013 13:47:13 +0000 (17:47 +0400)]
moved inline implementation to separate file
Vladislav Vinogradov [Mon, 15 Apr 2013 10:17:18 +0000 (14:17 +0400)]
added Stream support to ogl::Buffer
Vladislav Vinogradov [Mon, 15 Apr 2013 09:27:12 +0000 (13:27 +0400)]
removed obsolete DevMem2D class
Vladislav Vinogradov [Thu, 30 May 2013 07:23:18 +0000 (11:23 +0400)]
renamed gpu headers (made it more consistent)
Vladislav Vinogradov [Fri, 26 Apr 2013 06:49:51 +0000 (10:49 +0400)]
added CudaMem support to Input/Output arrays
Vladislav Vinogradov [Mon, 15 Apr 2013 07:29:21 +0000 (11:29 +0400)]
removed ogl::Texture2D support from InputArray
Roman Donchenko [Mon, 10 Jun 2013 08:05:52 +0000 (12:05 +0400)]
Merge pull request #964 from jet47:cuda-5.5-support
berak [Fri, 7 Jun 2013 16:29:00 +0000 (18:29 +0200)]
Moments.nu** fields initialized in completeMomentState( Moments* moments )
berak [Fri, 7 Jun 2013 16:13:15 +0000 (18:13 +0200)]
restored utility.hpp
berak [Fri, 7 Jun 2013 15:22:42 +0000 (17:22 +0200)]
added initialization of Moments.nu** params in completeMomentState( Moments* moments )
Vladislav Vinogradov [Tue, 4 Jun 2013 11:01:06 +0000 (15:01 +0400)]
fixed BroxOpticalFlow sanity test (increase epsilon value)
Vladislav Vinogradov [Tue, 4 Jun 2013 10:59:47 +0000 (14:59 +0400)]
fixed BoxFilter sanity test (different rounding results)
Vladislav Vinogradov [Tue, 4 Jun 2013 09:58:45 +0000 (13:58 +0400)]
fixed BroxOpticalFlow regression test
the output of BroxOpticalFlow differs a bit in CUDA 5.5
Vladislav Vinogradov [Fri, 7 Jun 2013 10:56:37 +0000 (14:56 +0400)]
rewrite core/cuda/vec_math.hpp file
old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp
Vladislav Vinogradov [Fri, 7 Jun 2013 10:46:42 +0000 (14:46 +0400)]
fixed constructors for functional objects (added __host__ modifier)
Vladislav Vinogradov [Fri, 7 Jun 2013 10:38:27 +0000 (14:38 +0400)]
fixed NPP error constants usage
Roman Donchenko [Fri, 7 Jun 2013 10:33:33 +0000 (14:33 +0400)]
Merge pull request #900 from jet47:restore-gpu-modules
Vadim Pisarevsky [Fri, 7 Jun 2013 09:44:28 +0000 (13:44 +0400)]
Merge pull request #946 from bitwangyaoyao:2.4_samples2
Vadim Pisarevsky [Fri, 7 Jun 2013 09:44:10 +0000 (13:44 +0400)]
Merge pull request #957 from pengx17:2.4_fix_corner_detector
Vadim Pisarevsky [Fri, 7 Jun 2013 09:43:50 +0000 (13:43 +0400)]
Merge pull request #963 from bitwangyaoyao:master_oclMat
Vladislav Vinogradov [Fri, 7 Jun 2013 09:34:33 +0000 (13:34 +0400)]
fixed compiler warning
removed -fvisibility-inlines-hidden compiler option for CUDA sources
Vladislav Vinogradov [Tue, 4 Jun 2013 09:32:35 +0000 (13:32 +0400)]
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
Roman Donchenko [Fri, 7 Jun 2013 08:45:02 +0000 (12:45 +0400)]
Merge pull request #949 from SpecLad:merge-2.4
yao [Fri, 7 Jun 2013 07:31:12 +0000 (15:31 +0800)]
remove commented lines
Roman Donchenko [Fri, 7 Jun 2013 07:29:40 +0000 (11:29 +0400)]
Merge pull request #960 from SpecLad:extra-modules
Roman Donchenko [Fri, 7 Jun 2013 07:28:10 +0000 (11:28 +0400)]
Merge pull request #951 from apavlenko:fix_java_test_randshuffle
Roman Donchenko [Fri, 7 Jun 2013 07:27:45 +0000 (11:27 +0400)]
Merge pull request #959 from SpecLad:qt4-build
yao [Fri, 7 Jun 2013 07:27:44 +0000 (15:27 +0800)]
merge openCLMallocPitch and openCLMallocPitchEx into one interface
Roman Donchenko [Thu, 6 Jun 2013 13:58:14 +0000 (17:58 +0400)]
Merge pull request #955 from SpecLad:symlink
Roman Donchenko [Thu, 6 Jun 2013 10:09:33 +0000 (14:09 +0400)]
Fix a missing header path when building with Qt 4.
Also, removing explicit include path configuration,
since QT_USE_FILE takes care of that.
Roman Donchenko [Thu, 6 Jun 2013 08:09:41 +0000 (12:09 +0400)]
Merge pull request #956 from IanVS:COLOR_CODE
peng xiao [Thu, 6 Jun 2013 03:44:35 +0000 (11:44 +0800)]
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.
IanVS [Thu, 6 Jun 2013 01:55:56 +0000 (21:55 -0400)]
Updated documentation to new "COLOR_" format for color conversion enums.
Roman Donchenko [Wed, 5 Jun 2013 14:09:47 +0000 (18:09 +0400)]
Add support for adding custom OpenCV modules.
Roman Donchenko [Wed, 5 Jun 2013 13:56:35 +0000 (17:56 +0400)]
Merge pull request #953 from jet47:fix-bug-3069
Roman Donchenko [Wed, 5 Jun 2013 13:50:11 +0000 (17:50 +0400)]
Merge pull request #952 from SpecLad:jepg
Roman Donchenko [Wed, 5 Jun 2013 11:54:27 +0000 (15:54 +0400)]
Don't resolve symlinks when looking for modules.
We don't really need it, it makes the code longer, and it can lead to
inconsistent paths when OpenCV is itself inside a symlink.
Roman Donchenko [Wed, 5 Jun 2013 13:04:21 +0000 (17:04 +0400)]
Merge pull request #948 from jet47:cuda-5.5-support
Roman Donchenko [Wed, 5 Jun 2013 12:00:25 +0000 (16:00 +0400)]
Merge pull request #890 from caorong:patch-1
caorong [Thu, 16 May 2013 03:26:37 +0000 (11:26 +0800)]
fix a bug(DetectorType never change)
changed line281 -> line220
Presentation:
because line 220 give the globle var mDetectorType,and in line 230 it will be compared with mDeteorType !!! it will never be unequal ~
fix:
change mDetectorType(previous globle var) to a new local val tmpDetectorType
Roman Donchenko [Tue, 4 Jun 2013 14:31:51 +0000 (18:31 +0400)]
Merge remote-tracking branch 'origin/2.4'
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
Vladislav Vinogradov [Wed, 5 Jun 2013 10:08:55 +0000 (14:08 +0400)]
fixed bug #3069 (infinite loop in GPU LBP Cascade detectMultiScale)
Roman Donchenko [Wed, 5 Jun 2013 09:51:11 +0000 (13:51 +0400)]
Fix typo in .gitattributes.
Roman Donchenko [Wed, 5 Jun 2013 09:32:33 +0000 (13:32 +0400)]
Merge pull request #950 from apavlenko:fix_java_mat_dump
Andrey Pavlenko [Wed, 5 Jun 2013 08:41:09 +0000 (12:41 +0400)]
fix failing test
small matrix becomes the same after shuffling
Roman Donchenko [Wed, 5 Jun 2013 07:50:11 +0000 (11:50 +0400)]
Merge pull request #947 from jet47:fix-gpu-arm-build
Andrey Pavlenko [Wed, 5 Jun 2013 07:46:06 +0000 (11:46 +0400)]
fixing broken Mat::dump() in Java
Roman Donchenko [Wed, 5 Jun 2013 07:27:08 +0000 (11:27 +0400)]
Merge pull request #941 from apavlenko:signed_char
Roman Donchenko [Tue, 4 Jun 2013 13:52:30 +0000 (17:52 +0400)]
Merge pull request #893 from jet47:gpu-arm-fixes
Roman Donchenko [Tue, 4 Jun 2013 13:50:31 +0000 (17:50 +0400)]
Merge pull request #940 from SpecLad:autolock
Vladislav Vinogradov [Tue, 4 Jun 2013 11:01:06 +0000 (15:01 +0400)]
fixed BroxOpticalFlow sanity test (increase epsilon value)
+ interpolateFrames and createOpticalFlowNeedleMap
Vladislav Vinogradov [Tue, 4 Jun 2013 10:59:47 +0000 (14:59 +0400)]
fixed BoxFilter sanity test (different rounding results)
Vladislav Vinogradov [Tue, 4 Jun 2013 09:58:45 +0000 (13:58 +0400)]
fixed BroxOpticalFlow regression test
the output of BroxOpticalFlow differs a bit in CUDA 5.5
Vladislav Vinogradov [Tue, 4 Jun 2013 09:57:35 +0000 (13:57 +0400)]
rewrite gpu/device/vec_math.hpp file
old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:53 +0000 (13:34 +0400)]
Merge pull request #933 from pengx17:2.4_macfix_cont
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:39 +0000 (13:34 +0400)]
Merge pull request #935 from pengx17:2.4_filter2d_fix
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:25 +0000 (13:34 +0400)]
Merge pull request #936 from bitwangyaoyao:2.4_perf
Vadim Pisarevsky [Tue, 4 Jun 2013 09:34:09 +0000 (13:34 +0400)]
Merge pull request #937 from bitwangyaoyao:2.4_fixPyrLK
Vadim Pisarevsky [Tue, 4 Jun 2013 09:33:48 +0000 (13:33 +0400)]
Merge pull request #938 from pengx17:2.4_surf_sample
Vadim Pisarevsky [Tue, 4 Jun 2013 09:33:21 +0000 (13:33 +0400)]
Merge pull request #939 from pengx17:2.4_getDevice
Vadim Pisarevsky [Tue, 4 Jun 2013 09:32:34 +0000 (13:32 +0400)]
Merge pull request #945 from malcolmreynolds:master
Vladislav Vinogradov [Tue, 4 Jun 2013 08:51:36 +0000 (12:51 +0400)]
fixed gpu module build on arm platform
links with CUDA driver library only if we use video encoding/decoding
yao [Tue, 4 Jun 2013 07:59:21 +0000 (15:59 +0800)]
use GoodFeaturesToTrackDetector_OCL
peng xiao [Tue, 4 Jun 2013 07:55:33 +0000 (15:55 +0800)]
Fix a bug of gfft.
When user provided corners buffer is big enough to be copied to from
tmpCorners_, we allow the buffer to be reused other than allocate a new
cl_mem object.
yao [Tue, 4 Jun 2013 03:31:54 +0000 (11:31 +0800)]
change a test image of pyrlk
Malcolm Reynolds [Mon, 3 Jun 2013 16:07:05 +0000 (18:07 +0200)]
update safe_call.hpp to fix OpenCL import on case sensitive mac FS
On a Mac with a case sensitive filesystem <OpenCL/OpenCL.h> does not exist but <OpenCL/opencl.h> does. I presume (!), but have no way to test, that on a Mac with case insensitive FS this change will make no difference.
Malcolm Reynolds [Mon, 3 Jun 2013 16:06:25 +0000 (18:06 +0200)]
update util.hpp to fix OpenCL import on case sensitive mac FS
On a Mac with a case sensitive filesystem <OpenCL/OpenCL.h> does not exist but <OpenCL/opencl.h> does. I presume (!), but have no way to test, that on a Mac with case insensitive FS this change will make no difference.
Roman Donchenko [Mon, 3 Jun 2013 12:08:23 +0000 (16:08 +0400)]
Merge pull request #943 from jet47:cuda-5.5-support
Roman Donchenko [Mon, 3 Jun 2013 12:08:06 +0000 (16:08 +0400)]
Merge pull request #944 from jet47:cmake-2.8.11-cuda-fix
Vladislav Vinogradov [Mon, 3 Jun 2013 10:41:23 +0000 (14:41 +0400)]
fixed constructors for functional objects (added __host__ modifier)
Vladislav Vinogradov [Mon, 3 Jun 2013 10:01:04 +0000 (14:01 +0400)]
disabled samples with driver api
Vladislav Vinogradov [Mon, 3 Jun 2013 09:36:02 +0000 (13:36 +0400)]
fixed norm diff function (it uses pre-allocated buffer now)
Vladislav Vinogradov [Mon, 3 Jun 2013 09:34:41 +0000 (13:34 +0400)]
fixed NPP error constants usage
Vladislav Vinogradov [Mon, 3 Jun 2013 09:33:53 +0000 (13:33 +0400)]
fixed NPP library search (it was splitted)
Vladislav Vinogradov [Mon, 3 Jun 2013 09:24:57 +0000 (13:24 +0400)]
fixed GPU module compialtion with CMake 2.8.11
CMake 2.8.11 removed linkage with CUDA driver library,
but it's used by gpu video encoding/decoding
Roman Donchenko [Mon, 3 Jun 2013 08:13:44 +0000 (12:13 +0400)]
Merge pull request #912 from SpecLad:contributing
Roman Donchenko [Mon, 3 Jun 2013 08:13:15 +0000 (12:13 +0400)]
Merge pull request #934 from SpecLad:parallel-for
Andrey Pavlenko [Fri, 31 May 2013 15:55:51 +0000 (19:55 +0400)]
making the comment less ambigous