opencv/modules/ocl/src
Roman Donchenko f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
..
opencl Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
arithm.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
binarycaching.hpp
blend.cpp Remove C API from OpenCL module 2013-04-12 14:37:02 +04:00
brute_force_matcher.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
build_warps.cpp
canny.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
color.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
columnsum.cpp
error.cpp Remove C API from OpenCL module 2013-04-12 14:37:02 +04:00
fft.cpp Remove C API from OpenCL module 2013-04-12 14:37:02 +04:00
filtering.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
gemm.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
gftt.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
haar.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
hog.cpp Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
hough.cpp Remove C API from OpenCL module 2013-04-12 14:37:02 +04:00
imgproc.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
initialization.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
interpolate_frames.cpp
kmeans.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
match_template.cpp Merge pull request #810 from pengx17:master_fix_ocl_tmflag 2013-04-13 16:33:53 +04:00
matrix_operations.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-25 15:55:52 +04:00
mcwutil.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
moments.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
mssegmentation.cpp
optical_flow_farneback.cpp Move function definition from header to cpp. 2013-06-28 10:52:39 +08:00
precomp.hpp Fix the problem of haar caused by merge 2013-07-22 17:53:56 +08:00
pyrdown.cpp
pyrlk.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
pyrup.cpp
safe_call.hpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
sort_by_key.cpp Some modifications to sortByKey API. 2013-07-30 11:53:25 +08:00
split_merge.cpp Remove C API from OpenCL module 2013-04-12 14:37:02 +04:00
stereo_csbp.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
stereobm.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
stereobp.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-08 18:47:38 +04:00
tvl1flow.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-05-27 16:58:04 +04:00