opencv/modules/ocl/src
Roman Donchenko 2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
..
opencl Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
arithm.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-27 19:15:47 +04:00
binarycaching.hpp Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
blend.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
brute_force_matcher.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
build_warps.cpp Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
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 Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
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 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
gemm.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
gftt.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00
haar.cpp Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
hog.cpp OCL: tests: repair/disable failed tests in ocl module 2013-08-22 17:06:47 +04:00
hough.cpp Remove C API from OpenCL module 2013-04-12 14:37:02 +04:00
imgproc.cpp Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
initialization.cpp Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
interpolate_frames.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
kmeans.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
match_template.cpp Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
matrix_operations.cpp War on Whitespace, master edition: trailing spaces. 2013-08-27 13:57:24 +04:00
mcwutil.cpp Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
moments.cpp OCL: tests: repair moments implementation in master branch, enable tests 2013-08-22 23:37:06 +04:00
mssegmentation.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
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 Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
pyrlk.cpp Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
pyrup.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
safe_call.hpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
sort_by_key.cpp Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
split_merge.cpp Remove C API from OpenCL module 2013-04-12 14:37:02 +04:00
stereo_csbp.cpp Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
stereobm.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00
stereobp.cpp Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
tvl1flow.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00