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
Roman Donchenko
0a42a3eb06
Merge pull request #956 from IanVS:COLOR_CODE
12 years ago
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.
12 years ago
IanVS
41fc41829c
Updated documentation to new "COLOR_" format for color conversion enums.
12 years ago
Roman Donchenko
a954d3630f
Add support for adding custom OpenCV modules.
12 years ago
Roman Donchenko
7f9675bcc0
Merge pull request #953 from jet47:fix-bug-3069
12 years ago
Roman Donchenko
7a80b9adaf
Merge pull request #952 from SpecLad:jepg
12 years ago
Roman Donchenko
985bfea556
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.
12 years ago
Roman Donchenko
087db2949a
Merge pull request #948 from jet47:cuda-5.5-support
12 years ago
Roman Donchenko
127a152f76
Merge pull request #890 from caorong:patch-1
12 years ago
caorong
a2adafd508
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
12 years ago
Roman Donchenko
bae85660da
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
12 years ago
Vladislav Vinogradov
31a5f7ef3c
fixed bug #3069 (infinite loop in GPU LBP Cascade detectMultiScale)
12 years ago
Roman Donchenko
93a44d4236
Fix typo in .gitattributes.
12 years ago
Roman Donchenko
a760684674
Merge pull request #950 from apavlenko:fix_java_mat_dump
12 years ago
Andrey Pavlenko
c2d3ce9ce5
fix failing test
...
small matrix becomes the same after shuffling
12 years ago
Roman Donchenko
27bff3c175
Merge pull request #947 from jet47:fix-gpu-arm-build
12 years ago
Andrey Pavlenko
c7873dd03d
fixing broken Mat::dump() in Java
12 years ago
Roman Donchenko
99340b5613
Merge pull request #941 from apavlenko:signed_char
12 years ago
Roman Donchenko
5b5815d8cf
Merge pull request #893 from jet47:gpu-arm-fixes
12 years ago
Roman Donchenko
f527b6a93f
Merge pull request #940 from SpecLad:autolock
12 years ago
Vladislav Vinogradov
89f3c40d79
fixed BroxOpticalFlow sanity test (increase epsilon value)
...
+ interpolateFrames and createOpticalFlowNeedleMap
12 years ago
Vladislav Vinogradov
4a770535c4
fixed BoxFilter sanity test (different rounding results)
12 years ago
Vladislav Vinogradov
516e5b2563
fixed BroxOpticalFlow regression test
...
the output of BroxOpticalFlow differs a bit in CUDA 5.5
12 years ago
Vladislav Vinogradov
918381875a
rewrite gpu/device/vec_math.hpp file
...
old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp
12 years ago
Vadim Pisarevsky
119b7a298d
Merge pull request #933 from pengx17:2.4_macfix_cont
12 years ago
Vadim Pisarevsky
2d88f20c1e
Merge pull request #935 from pengx17:2.4_filter2d_fix
12 years ago
Vadim Pisarevsky
0cb1644825
Merge pull request #936 from bitwangyaoyao:2.4_perf
12 years ago
Vadim Pisarevsky
e0c2daadbf
Merge pull request #937 from bitwangyaoyao:2.4_fixPyrLK
12 years ago
Vadim Pisarevsky
267eb99a7d
Merge pull request #938 from pengx17:2.4_surf_sample
12 years ago
Vadim Pisarevsky
37953b7cf0
Merge pull request #939 from pengx17:2.4_getDevice
12 years ago
Vadim Pisarevsky
6e119049ce
Merge pull request #945 from malcolmreynolds:master
12 years ago
Vladislav Vinogradov
3aea7e8f8d
fixed gpu module build on arm platform
...
links with CUDA driver library only if we use video encoding/decoding
12 years ago