8762 Commits

Author SHA1 Message Date
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 from jet47:cuda-5.5-support 2013-06-10 12:05:52 +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
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 from jet47:restore-gpu-modules 2013-06-07 14:33:35 +04:00
Vadim Pisarevsky
4cf7a963a0 Merge pull request from bitwangyaoyao:2.4_samples2 2013-06-07 13:44:29 +04:00
Vadim Pisarevsky
51f81eec36 Merge pull request from pengx17:2.4_fix_corner_detector 2013-06-07 13:44:10 +04:00
Vadim Pisarevsky
a5ffa1da34 Merge pull request 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 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
Roman Donchenko
10340fe234 Merge pull request 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 from SpecLad:extra-modules 2013-06-07 11:29:40 +04:00
Roman Donchenko
aa7f70c31e Merge pull request from apavlenko:fix_java_test_randshuffle 2013-06-07 11:28:10 +04:00
Roman Donchenko
9b46c6fb8a Merge pull request 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 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 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
IanVS
41fc41829c Updated documentation to new "COLOR_" format for color conversion enums. 2013-06-05 21:59:01 -04:00
Roman Donchenko
a954d3630f Add support for adding custom OpenCV modules. 2013-06-05 18:10:44 +04:00
Roman Donchenko
7f9675bcc0 Merge pull request from jet47:fix-bug-3069 2013-06-05 17:56:35 +04:00
Roman Donchenko
7a80b9adaf Merge pull request from SpecLad:jepg 2013-06-05 17:50:12 +04:00
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.
2013-06-05 17:17:13 +04:00
Roman Donchenko
087db2949a Merge pull request from jet47:cuda-5.5-support 2013-06-05 17:04:22 +04:00
Roman Donchenko
127a152f76 Merge pull request from caorong:patch-1 2013-06-05 16:00:25 +04:00
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
2013-06-05 15:57:54 +04:00
Roman Donchenko
bae85660da Merge remote-tracking branch 'origin/2.4'
Pull requests:
	 from jet47:cuda-5.5-support
	 from jet47:cmake-2.8.11-cuda-fix
	 from SpecLad:contributing
	 from SpecLad:parallel-for
	 from jet47:gpu-test-fixes
	 from bitwangyaoyao:2.4_fixBFM
	 from bitwangyaoyao:2.4_samples
	 from pengx17:2.4_arithm_fix
	 from pengx17:2.4_canny_tmp_fix
	 from bitwangyaoyao:2.4_perf
	 from pengx17:2.4_haar_ext
	 from apavlenko:bugfix_3027
	 from asmorkalov:android_move
	 from pengx17:2.4_oclgfft
	 from janm399:2.4
	 from bitwangyaoyao:2.4_fixPyrLK
	 from abidrahmank:2.4
	 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
2013-06-05 15:42:07 +04:00
Vladislav Vinogradov
31a5f7ef3c fixed bug (infinite loop in GPU LBP Cascade detectMultiScale) 2013-06-05 14:08:55 +04:00
Roman Donchenko
93a44d4236 Fix typo in .gitattributes. 2013-06-05 13:51:11 +04:00
Roman Donchenko
a760684674 Merge pull request from apavlenko:fix_java_mat_dump 2013-06-05 13:32:34 +04:00
Andrey Pavlenko
c2d3ce9ce5 fix failing test
small matrix becomes the same after shuffling
2013-06-05 12:41:09 +04:00
Roman Donchenko
27bff3c175 Merge pull request from jet47:fix-gpu-arm-build 2013-06-05 11:50:12 +04:00
Andrey Pavlenko
c7873dd03d fixing broken Mat::dump() in Java 2013-06-05 11:46:06 +04:00
Roman Donchenko
99340b5613 Merge pull request from apavlenko:signed_char 2013-06-05 11:27:08 +04:00
Roman Donchenko
5b5815d8cf Merge pull request from jet47:gpu-arm-fixes 2013-06-04 17:52:30 +04:00
Roman Donchenko
f527b6a93f Merge pull request from SpecLad:autolock 2013-06-04 17:50:31 +04:00
Vladislav Vinogradov
89f3c40d79 fixed BroxOpticalFlow sanity test (increase epsilon value)
+ interpolateFrames and createOpticalFlowNeedleMap
2013-06-04 15:01:06 +04:00