Merge remote-tracking branch 'origin/2.4'
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 4 Jun 2013 14:31:51 +0000 (18:31 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Wed, 5 Jun 2013 11:42:07 +0000 (15:42 +0400)
commitbae85660daf55f29c20ffbe644305e8027634ae7
tree64c0ea0a820652f32eeedda70771d480cda22c9f
parentd81d3fc83028fe5340002770f025e4406de6933b
parent75cf5cc4ee0fee4554ccf28a1f0eb2a3c61f1d83
Merge remote-tracking branch 'origin/2.4'

Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix

Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
60 files changed:
CMakeLists.txt
apps/traincascade/boost.cpp
modules/calib3d/src/solvepnp.cpp
modules/core/include/opencv2/core/cuda/detail/color_detail.hpp
modules/core/include/opencv2/core/cuda/functional.hpp
modules/core/include/opencv2/core/cuda/utility.hpp
modules/features2d/src/detectors.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/calib3d.cpp
modules/gpu/src/cuda/calib3d.cu
modules/gpu/src/cuda/canny.cu
modules/gpu/src/cuda/element_operations.cu
modules/gpu/src/matrix_reductions.cpp
modules/gpu/test/test_core.cpp
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/src/color.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/histogram.cpp
modules/imgproc/src/morph.cpp
modules/ml/src/gbt.cpp
modules/ml/src/svm.cpp
modules/nonfree/src/surf.cpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/latentsvm.cpp
modules/ocl/include/opencv2/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/brute_force_matcher.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gfft.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/test/test_haar.cpp
modules/photo/src/denoising.cpp
modules/photo/src/fast_nlmeans_denoising_invoker.hpp
modules/photo/src/fast_nlmeans_multi_denoising_invoker.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/matchers.cpp
modules/stitching/src/precomp.hpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/stereo_match.cpp