mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-02 23:48:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,337 Commits 6 Branches 127 Tags 3 GiB
73b0827ec1
Commit Graph

11337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilya Lavrenov
c404da784f fixed ocl::norm (previously the function used double as a work type) 2013-10-08 18:43:49 +04:00
Roman Donchenko
cc7a13ea57 Named GraphCutSeamFinderBase to allow its usage in makePtr. 
Sequel to bcb6f038.
 2013-10-08 18:13:56 +04:00
Roman Donchenko
f07769e9d8 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectOpenCL.cmake
	cmake/OpenCVModule.cmake
	modules/imgproc/src/floodfill.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_programcache.hpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/mssegmentation.cpp
	modules/ocl/src/precomp.hpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/stereo_csbp.cpp
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/main.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/stereo_match.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp
 2013-10-08 17:57:23 +04:00
Sebastian Krämer
4ffd3fb905 add ocl::abs 2013-10-08 15:23:24 +02:00
Sebastian Krämer
c844bbdd82 documentation update for ocl::min and ocl::max 2013-10-08 15:23:18 +02:00
Sebastian Krämer
33df7131ae add ocl::min and ocl::max (includes accuracy tests update) 2013-10-08 15:23:13 +02:00
Vladislav Vinogradov
342e007dc6 now Allocator accepts GpuMat* instead of 3 pointers 2013-10-08 17:21:25 +04:00
Vladislav Vinogradov
3b412b51ac moved BufferPool management functions to public 2013-10-08 17:21:22 +04:00
Vladislav Vinogradov
5ea8085220 added BufferPool class 2013-10-08 17:20:29 +04:00
Vladislav Vinogradov
988ab79acb added BufferAllocator 2013-10-08 17:20:20 +04:00
Roman Donchenko
ae851af648 Merge pull request #1574 from alalek:svm_workaround 2013-10-08 15:31:42 +04:00
Roman Donchenko
65ec9f77d9 Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12 2013-10-08 15:15:31 +04:00
Roman Donchenko
bc3669bfb1 Merge pull request #1576 from alalek:ocl_fix_cl_double 2013-10-08 14:20:11 +04:00
Roman Donchenko
685eceb68a Merge pull request #1567 from ilya-lavrenov:warn_fix 2013-10-08 13:50:49 +04:00
Roman Donchenko
895308a811 Merge pull request #1538 from StevenPuttemans:bugfix_3283 2013-10-08 13:00:39 +04:00
Roman Donchenko
ec409a436d Merge pull request #1545 from alalek:ocl_test_fix_rng 2013-10-08 12:59:50 +04:00
Ilya Lavrenov
32f11e6f40 enabled OpenCL 1.2 branch in oclMat::setTo 2013-10-08 12:49:29 +04:00
Ilya Lavrenov
35d9ce0c0c fixed warnings 2013-10-08 12:46:43 +04:00
Roman Donchenko
95b3a344d9 Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix 2013-10-08 12:32:57 +04:00
Alexander Alekhin
1d6327ba2a ocl: fix Context::CL_* usage 2013-10-08 12:23:46 +04:00
Roman Donchenko
efeadc1f7b Merge pull request #1578 from asmorkalov:android_fd_cp_fix 2013-10-08 12:22:14 +04:00
Alexander Smorkalov
fdc1a06397 Invalid copy-passed exception messages in FaceDetect sample for Android fixed. 2013-10-08 10:28:24 +04:00
Alexander Alekhin
f63b0dfaf4 svm: disable failed tests 2013-10-07 18:17:10 +04:00
Roman Donchenko
b08233a3ca Merge pull request #1569 from ilya-lavrenov:ocl_hough_circles 2013-10-07 17:47:41 +04:00
Roman Donchenko
920e15b41d Merge pull request #1572 from emchristiansen:includeLimits 2013-10-07 16:59:24 +04:00
Roman Donchenko
f91f8663b6 Merge pull request #1568 from ilya-lavrenov:ocl_pyrlk 2013-10-07 15:53:20 +04:00
Roman Donchenko
801054d611 Merge pull request #1566 from SpecLad:Wshadow-openni 2013-10-07 15:48:40 +04:00
Vladislav Vinogradov
e5188c7e94 added GpuMat::Allocator interface 2013-10-07 09:42:43 +04:00
emchristiansen
34f6b17c3f Merge pull request #1 from ImAlsoGreg/master 
add include limits, for compilers that dont add it implicitly
 2013-10-06 12:26:45 -07:00
Greg Hale
88b1847d09 add include limits, for compilers that dont add it implicitly 2013-10-06 01:21:43 -04:00
Eric Martin Christiansen
c8a3a85e26 adds include to fix build 2013-10-05 15:52:19 -07:00
Ilya Lavrenov
036e99d03a fixed ipp-related warnings 2013-10-05 14:54:00 +04:00
Ilya Lavrenov
8c82decf5b added plain branch to HoughCircle perf test 2013-10-04 19:51:26 +04:00
Roman Donchenko
46eeb106e2 Merge pull request #1564 from alalek:cl_runtime_fix_32bit 2013-10-04 18:29:04 +04:00
Roman Donchenko
0a13510293 Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update 2013-10-04 18:25:44 +04:00
Ilya Lavrenov
72c35d3a89 fixed mog2 2013-10-04 18:19:01 +04:00
Roman Donchenko
df213241cc Merge pull request #1560 from jet47:cmake-config-cuda-5.5-fix 2013-10-04 18:15:05 +04:00
Roman Donchenko
744f4b1609 Merge pull request #1565 from SpecLad:cmake-new-ptr 2013-10-04 18:14:34 +04:00
Roman Donchenko
2660f4bc59 Merge pull request #1562 from ilya-lavrenov:ocl_integral 2013-10-04 18:12:43 +04:00
Ilya Lavrenov
fb73e7b4bd fixed pyrlk optical flow 2013-10-04 17:56:02 +04:00
Roman Donchenko
aa80250a3d Merge pull request #1532 from alalek:stereo_csbp 2013-10-04 16:43:51 +04:00
Roman Donchenko
cca2e5d8b1 Merge pull request #1536 from asmorkalov:android_ndk_r9_master 2013-10-04 16:36:44 +04:00
Roman Donchenko
1b51270617 Merge pull request #1558 from SpecLad:Wparentheses-equality 2013-10-04 16:32:09 +04:00
Roman Donchenko
f04cade607 Merge pull request #1559 from SpecLad:Wnull-conversion 2013-10-04 16:08:54 +04:00
Alexander Alekhin
de0f310e81 ocl: tests: RNG usage refactoring 2013-10-04 15:39:39 +04:00
Vladislav Vinogradov
adc516becc fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit 2013-10-04 15:14:21 +04:00
Roman Donchenko
3cfad385ec Fix a -Wshadow warning in cap_openni.cpp. 2013-10-04 14:23:06 +04:00
Roman Donchenko
ca65fe4548 Merge pull request #1535 from asmorkalov:android_ndk_r9 2013-10-04 14:14:20 +04:00
Roman Donchenko
b03c19a8ac Merge pull request #1554 from pablospe:fix_viz_module_compilation 2013-10-04 14:02:17 +04:00
Roman Donchenko
61778a524f Merge pull request #1563 from ilya-lavrenov:ocl_arithm 2013-10-04 13:59:19 +04:00