generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,900 Commits 3 Branches 47 Tags 422 MiB
9dc93ce328
Commit Graph

177 Commits

Author SHA1 Message Date
Roman Donchenko
e45fd939c2 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
	modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
	modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
	modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
 2014-01-20 15:10:19 +04:00
Andrey Pavlenko
4c99196399 adding finish() to flush CL queue, renaming the test to match 'master' branch 2014-01-13 18:12:30 +04:00
Andrey Pavlenko
a7821c60e5 refactoring the test as it should be in 2.4 2014-01-13 11:20:17 +04:00
Andrey Pavlenko
4d28e8243c 'master'-like Haar perf test 2014-01-10 00:14:48 +04:00
Andrey Pavlenko
80816f68f3 Merge pull request #2034 from pentschev:ocl_features2d_orb_master 2013-12-27 15:49:28 +04:00
Peter Andreas Entschev
07c5e33023 OCL: included ORB featured detector/descriptor extractor. 2013-12-26 22:36:24 -02:00
Alexander Alekhin
e49065b1dc core/ocl: temporary move device selection from ocl module 2013-12-25 16:17:40 +04:00
Andrey Pavlenko
b43d6b6858 Merge pull request #1954 from pentschev:ocl_features2d_fast_master 2013-12-12 17:37:09 +04:00
Peter Andreas Entschev
5bc9f15dda OCL: included sqrt matrix operation. 2013-12-12 08:57:27 -02:00
Peter Andreas Entschev
41bec1b112 OCL: including FAST feature detector. 2013-12-11 21:23:27 -02:00
Roman Donchenko
464a010f53 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/operations.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/src/color.cpp
	modules/features2d/src/orb.cpp
	modules/imgproc/src/samplers.cpp
	modules/ocl/include/opencv2/ocl/matrix_operations.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	samples/ocl/facedetect.cpp
 2013-12-10 12:51:00 +04:00
Alexander Alekhin
fe01bc21c0 perf: test-based metrics collection strategy 2013-12-03 18:43:50 +04:00
Alexander Alekhin
c962a9d61c ocl:perf: fix moments test for plain impl 2013-12-03 16:02:55 +04:00
Roman Donchenko
9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
 2013-11-26 15:05:26 +04:00
Ilya Lavrenov
d764af5318 added extra parameters to ocl::cvtColor performance test 2013-11-21 12:53:21 +04:00
Roman Donchenko
aacf188e83 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_color.cpp
	samples/cpp/3calibration.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/camshiftdemo.cpp
	samples/cpp/descriptor_extractor_matcher.cpp
	samples/cpp/distrans.cpp
	samples/cpp/generic_descriptor_match.cpp
	samples/cpp/grabcut.cpp
	samples/cpp/morphology2.cpp
	samples/cpp/segment_objects.cpp
	samples/cpp/stereo_calib.cpp
	samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
	samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
	samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
	samples/cpp/video_dmtx.cpp
 2013-11-19 16:21:09 +04:00
Ilya Lavrenov
198cd1a40d added area fast mode to ocl::resize 2013-11-19 13:43:50 +04:00
Ilya Lavrenov
f70d63e4c9 added INTER_AREA interpolation to ocl::resize 2013-11-18 18:28:49 +04:00
Roman Donchenko
84da6ca265 Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps 2013-11-14 14:46:06 +04:00
Roman Donchenko
15f4292a1f Merge pull request #1788 from alalek:perf_test_skip 2013-11-13 17:21:52 +04:00
Roman Donchenko
54ea5bbac7 Merge pull request #1779 from perping:integral_2.4 2013-11-13 15:53:42 +04:00
Alexander Alekhin
fb326a58fc ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize 2013-11-13 14:17:57 +04:00
Ilya Lavrenov
c38e4f9639 added eps to ocl::buildWarpPerspectiveMaps perf test 2013-11-13 13:04:02 +04:00
Roman Donchenko
834705490e Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat 2013-11-12 12:53:34 +04:00
Roman Donchenko
46e423d217 Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps 2013-11-12 12:26:37 +04:00
perping
8af626d295 fix some bug about haar and match_template. 2013-11-12 13:56:47 +08:00
Ilya Lavrenov
daedc6f454 removed 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter 2013-11-11 18:14:44 +04:00
Ilya Lavrenov
3727168b50 added a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate file 2013-11-11 18:07:23 +04:00
Roman Donchenko
4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
 2013-11-11 16:55:36 +04:00
Roman Donchenko
800d53f76b Merge pull request #1759 from ilya-lavrenov:ocl_distanceToCenters 2013-11-08 12:39:14 +04:00
Roman Donchenko
0be2752366 Merge pull request #1755 from KonstantinMatskevich:dump_info 2013-11-08 12:31:04 +04:00
Konstantin Matskevich
e9edfd1c54 update 2013-11-07 17:21:56 +04:00
Ilya Lavrenov
56d943388d speeded up ocl::distanceToCenters 2013-11-06 20:02:31 +04:00
Konstantin Matskevich
5304e9f259 extending openCL info dump 2013-11-06 15:20:05 +04:00
Andrey Pavlenko
95767676b7 Merge pull request #1739 from pengx17:2.4_ocl_overload_haar 2013-11-06 13:31:11 +04:00
peng xiao
53d1873776 Revert back test image. 2013-11-06 11:19:26 +08:00
Roman Donchenko
9c83f6c4fb Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	modules/core/include/opencv2/core/version.hpp
	modules/cudacodec/src/ffmpeg_video_source.cpp
	modules/gpu/src/video_writer.cpp
	modules/highgui/test/test_ffmpeg.cpp
	modules/highgui/test/test_video_io.cpp
	modules/highgui/test/test_video_pos.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/safe_call.hpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_moments.cpp
	samples/ocl/squares.cpp
 2013-11-05 16:38:23 +04:00
Ilya Lavrenov
2df53d97c5 added ocl::repeat 2013-11-05 12:23:20 +04:00
peng xiao
2a111f7a6c Let perf/accuracy test of ocl haar uses detectMultiScale api. 
Fix image to be used by perf test.
 2013-11-05 10:40:27 +08:00
Ilya Lavrenov
a8b7573db0 fixed ocl::Moments test 2013-11-01 00:09:11 +04:00
Andrey Pavlenko
bf58049d11 Merge pull request #1724 from ilya-lavrenov:ocl_thresh 2013-10-31 13:55:04 +04:00
Andrey Pavlenko
e80f5bed2d Merge pull request #1710 from melody-rain:2.4_moments_ocl 2013-10-31 13:54:46 +04:00
Jin Ma
3dbcd05407 fixed a typo. 2013-10-31 16:25:50 +08:00
Jin Ma
145ece8f9c removed test for double since not all platforms support double, thus the sanity check cannot pass on all the platforms. 2013-10-31 16:21:08 +08:00
Ilya Lavrenov
1d5f5d2364 vectorized ocl::threshold for single channel images 2013-10-31 12:00:53 +04:00
Ilya Lavrenov
16df5b007d disabled upload and download perf tests 2013-10-30 17:08:57 +04:00
Jin Ma
b6b190df5c Rewrote moments of opencl version. 2013-10-29 18:05:29 +08:00
Andrey Pavlenko
ea64589164 Merge pull request #1687 from bitwangyaoyao:2.4_fix 2013-10-29 11:03:34 +04:00
Andrey Pavlenko
9bfa346c38 Merge pull request #1544 from ilya-lavrenov:ocl_blendLinear 2013-10-29 10:49:46 +04:00
Andrey Pavlenko
106d5eda5f Merge pull request #1700 from ilya-lavrenov:ocl_bitwise_perf 2013-10-29 10:43:27 +04:00