projects / profile / ivi / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 31f0ab6 c1223f8)
Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 28 Oct 2013 09:38:25 +0000 (13:38 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 28 Oct 2013 09:38:25 +0000 (13:38 +0400)
commit78be4f66f736d579407e5159e2225187db67797e
treeda377573550b5eacfa3d6e63eda47f307b1e8dd2tree | snapshot
parent31f0ab6c80a0e8ae0c92ddf65fa86ca8bbde599acommit | diff
parentc1223f8dacfe0c1e6d1cf1aacf9ea74e28645317commit | diff
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
73 files changed:
CMakeLists.txt diff1 | diff2 | blob | history
cmake/OpenCVFindLibsPerf.cmake diff1 | diff2 | blob | history
cmake/OpenCVModule.cmake diff1 | diff2 | blob | history
cmake/templates/OpenCVConfig.cmake.in diff1 | diff2 | blob | history
modules/calib3d/src/calibration.cpp diff1 | diff2 | blob | history
modules/java/CMakeLists.txt diff1 | diff2 | blob | history
modules/nonfree/src/surf.ocl.cpp diff1 | diff2 | blob | history
modules/ocl/include/opencv2/ocl/matrix_operations.hpp diff1 | diff2 | blob | history
modules/ocl/perf/perf_bgfg.cpp diff1 | diff2 | blob | history
modules/ocl/perf/perf_calib3d.cpp diff1 | diff2 | blob | history
modules/ocl/perf/perf_color.cpp diff1 | diff2 | blob | history
modules/ocl/perf/perf_haar.cpp diff1 | diff2 | blob | history
modules/ocl/perf/perf_imgproc.cpp diff1 | diff2 | blob | history
modules/ocl/perf/perf_match_template.cpp diff1 | diff2 | blob | history
modules/ocl/perf/perf_precomp.hpp diff1 | diff2 | blob | history
modules/ocl/src/arithm.cpp diff1 | diff2 | blob | history
modules/ocl/src/bgfg_mog.cpp diff1 | diff2 | blob | history
modules/ocl/src/blend.cpp diff1 | diff2 | blob | history
modules/ocl/src/brute_force_matcher.cpp diff1 | diff2 | blob | history
modules/ocl/src/build_warps.cpp diff1 | diff2 | blob | history
modules/ocl/src/canny.cpp diff1 | diff2 | blob | history
modules/ocl/src/cl_context.cpp diff1 | diff2 | blob | history
modules/ocl/src/cl_operations.cpp diff1 | diff2 | blob | history
modules/ocl/src/cl_programcache.cpp diff1 | diff2 | blob | history
modules/ocl/src/cl_programcache.hpp diff1 | diff2 | blob | history
modules/ocl/src/color.cpp diff1 | diff2 | blob | history
modules/ocl/src/columnsum.cpp diff1 | diff2 | blob | history
modules/ocl/src/error.cpp diff1 | diff2 | blob | history
modules/ocl/src/fft.cpp diff1 | diff2 | blob | history
modules/ocl/src/filtering.cpp diff1 | diff2 | blob | history
modules/ocl/src/gemm.cpp diff1 | diff2 | blob | history
modules/ocl/src/gftt.cpp diff1 | diff2 | blob | history
modules/ocl/src/haar.cpp diff1 | diff2 | blob | history
modules/ocl/src/hog.cpp diff1 | diff2 | blob | history
modules/ocl/src/imgproc.cpp diff1 | diff2 | blob | history
modules/ocl/src/interpolate_frames.cpp diff1 | diff2 | blob | history
modules/ocl/src/kmeans.cpp diff1 | diff2 | blob | history
modules/ocl/src/knearest.cpp diff1 | diff2 | blob | history
modules/ocl/src/match_template.cpp diff1 | diff2 | blob | history
modules/ocl/src/matrix_operations.cpp diff1 | diff2 | blob | history
modules/ocl/src/mcwutil.cpp diff1 | diff2 | blob | history
modules/ocl/src/moments.cpp diff1 | diff2 | blob | history
modules/ocl/src/mssegmentation.cpp diff1 | diff2 | blob | history
modules/ocl/src/optical_flow_farneback.cpp diff1 | diff2 | blob | history
modules/ocl/src/precomp.hpp diff1 | diff2 | blob | history
modules/ocl/src/pyrdown.cpp diff1 | diff2 | blob | history
modules/ocl/src/pyrlk.cpp diff1 | diff2 | blob | history
modules/ocl/src/pyrup.cpp diff1 | diff2 | blob | history
modules/ocl/src/split_merge.cpp diff1 | diff2 | blob | history
modules/ocl/src/stereo_csbp.cpp diff1 | diff2 | blob | history
modules/ocl/src/stereobm.cpp diff1 | diff2 | blob | history
modules/ocl/src/stereobp.cpp diff1 | diff2 | blob | history
modules/ocl/src/svm.cpp diff1 | diff2 | blob | history
modules/ocl/src/tvl1flow.cpp diff1 | diff2 | blob | history
modules/ocl/test/test_bgfg.cpp diff1 | diff2 | blob | history
modules/ocl/test/test_color.cpp diff1 | diff2 | blob | history
modules/ocl/test/test_fft.cpp diff1 | diff2 | blob | history
modules/ocl/test/test_kmeans.cpp diff1 | diff2 | blob | history
modules/ocl/test/test_optflow.cpp diff1 | diff2 | blob | history
modules/ocl/test/utility.cpp diff1 | diff2 | blob | history
modules/ocl/test/utility.hpp diff1 | diff2 | blob | history
modules/superres/src/btv_l1_ocl.cpp diff1 | diff2 | blob | history
samples/gpu/super_resolution.cpp diff1 | diff2 | blob | history
samples/ocl/adaptive_bilateral_filter.cpp diff1 | diff2 | blob | history
samples/ocl/bgfg_segm.cpp diff1 | diff2 | blob | history
samples/ocl/clahe.cpp diff1 | diff2 | blob | history
samples/ocl/facedetect.cpp diff1 | diff2 | blob | history
samples/ocl/hog.cpp diff1 | diff2 | blob | history
samples/ocl/pyrlk_optical_flow.cpp diff1 | diff2 | blob | history
samples/ocl/squares.cpp diff1 | diff2 | blob | history
samples/ocl/stereo_match.cpp diff1 | diff2 | blob | history
samples/ocl/surf_matcher.cpp diff1 | diff2 | blob | history
samples/ocl/tvl1_optical_flow.cpp diff1 | diff2 | blob | history
Domain: Multimedia / Uncategorized;