third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,199 Commits 3 Branches 0 Tags
fdfffa52916fdf30225bd26f6cee86eb05fbccad
Commit Graph

521 Commits

Author SHA1 Message Date
Vladislav Vinogradov 6bbac2a7d9 Merge branch 'master' into gpu-cuda-rename 2013-09-11 09:41:23 +04:00
Roman Donchenko 95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp
 2013-09-10 11:30:19 +04:00
Roman Donchenko 84435ba741 Merge pull request #1365 from bitwangyaoyao:2.4_bilateral 2013-09-09 16:46:33 +04:00
Roman Donchenko 45512a93e0 Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp 2013-09-09 12:39:12 +04:00
Jin Ma 2fb0d23104 Removed unnecessary process for conversion to 4-channel format. 2013-09-07 10:40:30 +08:00
Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
 2013-09-06 15:44:44 +04:00
ilya-lavrenov 27947474ec fixed data path 2013-09-06 13:25:56 +04:00
Jin Ma 172242a94e Revised performance test according to the feedback of the community. 2013-09-06 13:39:41 +08:00
Roman Donchenko 3bca57ac25 Boring changes - ocl. 2013-09-05 19:02:59 +04:00
Jin Ma 1366df8250 MOG&MOG2: Modified the performance test according to the feedback of the community. 2013-09-05 19:33:27 +08:00
Roman Donchenko 70711ac6c2 Merge pull request #1400 from ilya-lavrenov:ocl_test_mog 2013-09-05 11:58:52 +04:00
ilya-lavrenov 722bdc52a0 enabled gemm and dft erf test 2013-09-04 20:02:02 +04:00
ilya-lavrenov 0f8f489658 changed data path and eps 2013-09-04 18:46:46 +04:00
Jin Ma dd73016c8b Removed whitespace. 2013-09-04 15:00:36 +08:00
Jin Ma e528f39def Added the performance test for mog and mog2. 2013-09-04 14:37:46 +08:00
Vladislav Vinogradov 1ad4592bfc Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/cudaoptflow/perf/perf_optflow.cpp
	modules/cudaoptflow/src/tvl1flow.cpp
	samples/gpu/stereo_multi.cpp
 2013-09-04 09:58:32 +04:00
Roman Donchenko c42d61e464 Merge pull request #1283 from melody-rain:new_mog_mog2 2013-09-03 18:43:03 +04:00
Roman Donchenko b3e73cf7d6 Merge pull request #1388 from bitwangyaoyao:2.4_CLAHE 2013-09-03 18:30:15 +04:00
Roman Donchenko f50a829943 Merge pull request #1383 from pengx17:2.4_clblas 2013-09-03 12:05:01 +04:00
yao a70bdfc13f a little fix to tests and sample 2013-09-03 15:02:18 +08:00
pengxiao ea16539448 Fix a crash of ocl program if clAmdBlas is not linked. 2013-09-03 10:30:37 +08:00
peng xiao 7b3e3f69fb Modify according to @alalek. 2013-09-03 09:31:13 +08:00
Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp
 2013-09-02 19:44:51 +04:00
Vladislav Vinogradov e12496d150 removed gpu name usage from ocl module 2013-09-02 14:00:41 +04:00
Roman Donchenko bd7930ada1 Merge pull request #1345 from pengx17:2.4_tvl1ocl_opt 2013-09-02 13:09:22 +04:00
peng xiao 3c2a8912ee Let clAmdBlas library initialize once during program lifetime. 2013-09-02 10:06:01 +08:00
Roman Donchenko 114bec52fe Merge pull request #1363 from ilya-lavrenov:ocl_enable_tests 2013-08-30 12:24:24 +04:00
ilya-lavrenov a6084d2970 enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal 2013-08-29 18:39:09 +04:00
ilya-lavrenov 968c095403 gpu -> ocl 2013-08-29 18:32:06 +04:00
Jin Ma 114f3266d8 Removed performance test. 2013-08-29 17:35:47 +08:00
Jin Ma 4f3349ffe4 Added perf namespace. 2013-08-29 16:24:26 +08:00
Jin Ma 0233c4c198 Removed whitespace. 2013-08-29 15:49:02 +08:00
Jin Ma 14e083f1e0 Removed trailing whitespace 2013-08-29 14:09:00 +08:00
Jin Ma 5728612f95 Removed the trailing whitespace 2013-08-29 14:06:03 +08:00
yao ab235cda74 fix warnings 2013-08-29 11:59:19 +08:00
yao 26b5eb3e39 add adaptive bilateral filter (cpp and ocl version) 2013-08-29 10:48:15 +08:00
Roman Donchenko 122d0f8685 Deleted the now-empty ocl perf_precomp.cpp. 
See pull request #1241 for why.
 2013-08-28 13:26:30 +04:00
ilya-lavrenov 3c86aa4ae1 appended ocl::finish to test_cycle defines 2013-08-28 00:39:58 +04:00
Roman Donchenko 2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
 2013-08-27 19:15:47 +04:00
Roman Donchenko dd25f416a6 War on Whitespace, master edition: tabs. 2013-08-27 17:13:53 +04:00
Roman Donchenko 9ed475cf52 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
Roman Donchenko 9b92545ce6 War on Whitespace, master edition: trailing spaces. 2013-08-27 13:57:24 +04:00
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
 2013-08-27 13:26:44 +04:00
peng xiao 040b3b8265 Remove trailing whitespace. 2013-08-27 13:02:34 +08:00
peng xiao c74c517ce3 Fix build error. 2013-08-27 11:56:11 +08:00
peng xiao 168d1dc18c Make some tweaks to make sum operations less frequently 2013-08-27 11:42:54 +08:00
ilya-lavrenov d02ccc9590 the code was refactored and old test system code was removed 2013-08-26 12:36:31 +04:00
ilya-lavrenov 4c28a6f0f6 most of the performance tests was rewritten in google-test manner 2013-08-26 11:43:44 +04:00
Alexander Alekhin 7685b983db OCL: tests: repair moments implementation in master branch, enable tests 2013-08-22 23:37:06 +04:00
Ilya Lavrenov 6c4ad9b597 fixer error with incorrect condition 2013-08-22 17:38:55 +04:00