opencv/modules/ocl/src
Roman Donchenko 13cd0a0502 Merge remote-tracking branch 'origin/2.4'
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
..
opencl Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
arithm.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +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 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 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 Remove C API from OpenCL module 2013-04-12 14:37:02 +04:00
columnsum.cpp Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
gemm.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
gfft.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
haar.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
hog.cpp fix memory leak 2013-05-28 18:07:41 +08: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' 2013-06-19 15:25:37 +04:00
initialization.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
interpolate_frames.cpp Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +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 openCLMallocPitch and openCLMallocPitchEx into one interface 2013-06-07 15:27:44 +08:00
mcwutil.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
moments.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
mssegmentation.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
precomp.cpp
precomp.hpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
pyrdown.cpp Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
pyrlk.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
pyrup.cpp Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
safe_call.hpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04: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 branch '2.4' 2013-04-05 21:11:59 +04:00
tvl1flow.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-05-27 16:58:04 +04:00