generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
e2bbe7597b
opencv/modules/ocl/src
History
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
..
cl_runtime ocl: update autogenerated code 2013-10-18 15:47:11 +04:00
opencl Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
arithm.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
bgfg_mog.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
blend.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
brute_force_matcher.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
build_warps.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
canny.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
cl_context.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
cl_operations.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
cl_programcache.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
cl_programcache.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
color.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
columnsum.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
error.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
fft.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
filtering.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
gemm.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
gftt.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
haar.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
hog.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
hough.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-08 17:57:23 +04:00
imgproc.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
interpolate_frames.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
kalman.cpp fixing typo 2013-10-25 18:00:46 +04:00
kmeans.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
knearest.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
match_template.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
matrix_operations.cpp Merge pull request #1704 from SpecLad:merge-2.4 2013-10-29 13:13:05 +04:00
mcwutil.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
moments.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
mssegmentation.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
optical_flow_farneback.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
precomp.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
pyrdown.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
pyrlk.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
pyrup.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
safe_call.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
sort_by_key.cpp fixing typo 2013-10-25 18:00:46 +04:00
split_merge.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
stereo_csbp.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
stereobm.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
stereobp.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
svm.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-11 16:55:36 +04:00
tvl1flow.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00