mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-26 10:48:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2cc11e2c6a
opencv/modules/ocl/src
History
Roman Donchenko d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
2013-12-03 17:35:21 +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-12-03 17:35:21 +04:00
arithm.cpp Merge remote-tracking branch 'origin/master' into merge-2.4 2013-11-26 15:32:44 +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 Fixed build errors. 2013-11-27 12:59:19 +04:00
build_warps.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +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-12-03 17:35:21 +04:00
cl_operations.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00
cl_programcache.cpp Replaced most of the instances of "s = s +" with "s +=". 2013-11-22 17:59:56 +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-11-26 15:05:26 +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-26 15:05:26 +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-12-03 17:35:21 +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/master' into merge-2.4 2013-11-26 15:32:44 +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-11-19 16:21:09 +04:00
matrix_operations.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +04:00
mcwutil.cpp Replaced most of the instances of "s = s +" with "s +=". 2013-11-22 17:59:56 +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-12-03 17:35:21 +04:00
optical_flow_farneback.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +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 Some hacks to build and run OpenCL on Qualcomm S800. 2013-11-22 16:13:38 +04:00
split_merge.cpp Replaced most of the instances of "s = s +" with "s +=". 2013-11-22 17:59:56 +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