review.tizen.org Git - profile/ivi/opencv.git/commit

Merge remote-tracking branch 'origin/2.4'

Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp

author	Roman Donchenko <roman.donchenko@itseez.com>
	Tue, 21 May 2013 10:35:24 +0000 (14:35 +0400)
committer	Roman Donchenko <roman.donchenko@itseez.com>
	Tue, 21 May 2013 13:19:23 +0000 (17:19 +0400)
commit	029fce10c91986a36b71d5b40b2cfe824203d469
tree	9a241061aa3189719b4777dd0f0ca54b0994321d	tree \| snapshot
parent	416eaf2ae1d2dbb123a119c658d080a6460589c1	commit \| diff
parent	389be67605e258933f50fb37e7761de615a42ba9	commit \| diff

3rdparty/libjasper/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVDetectAndroidSDK.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVDetectPython.cmake	diff1 \|	diff2 \|	blob \| history
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst	diff1 \|	diff2 \|	blob \| history
modules/core/src/matmul.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/highgui/include/opencv2/highgui/highgui_c.h	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/grfmt_jpeg.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/grfmt_png.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/floodfill.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/imgwarp.cpp	diff1 \|	diff2 \|	blob \| history
modules/objdetect/src/cascadedetect.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl.hpp	diff1 \|	\|	blob \| history
modules/ocl/include/opencv2/ocl/ocl.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/brute_force_matcher.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/gemm.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/haar.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/initialization.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/opencl/arithm_bitwise_binary.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/haarobjectdetect.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/moments.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/stereobp.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/stereo_csbp.cpp	\|	diff2 \|	blob \| history
modules/ocl/src/stereobm.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/tvl1flow.cpp	\|	diff2 \|	blob \| history
modules/ocl/test/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_brute_force_matcher.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_haar.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_hog.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_moments.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_pyrup.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/utility.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts/ts_perf.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/src/ts_func.cpp	diff1 \|	diff2 \|	blob \| history