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

projects / profile / ivi / opencv.git / commit

author	Andrey Kamaev <andrey.kamaev@itseez.com>
	Fri, 29 Mar 2013 14:48:06 +0000 (18:48 +0400)
committer	Andrey Kamaev <andrey.kamaev@itseez.com>
	Fri, 29 Mar 2013 15:38:35 +0000 (19:38 +0400)
commit	f77a375354926092c3c8bc7ac838dae5614b7abb
tree	d0de4a00e8a5fd2de4c3ab5ed718034c08be2bab	tree \| snapshot
parent	3ceca9b7b136b7d7a0a551c8a34ccb0405b3e74a	commit \| diff
parent	e143706ef9e3544ae72be8cad5346c44e83e3957	commit \| diff

Merge branch '2.4'

103 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsGrfmt.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVModule.cmake	diff1 \|	diff2 \|	blob \| history
doc/tutorials/introduction/windows_visual_studio_image_watch/windows_visual_studio_image_watch.rst	\|	diff2 \|	blob \| history
modules/core/include/opencv2/core/cuda_devptrs.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/gpumat.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/opengl.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/operations.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/stream_accessor.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/gl_core_3_1.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_io.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/gpu/include/opencv2/gpu.hpp	diff1 \|	\|	blob \| history
modules/gpu/include/opencv2/gpu/gpu.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/perf/perf_calib3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/perf/perf_video.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/perf4au/main.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/bilateral_filter.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/blend.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/brute_force_matcher.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cascadeclassifier.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cu_safe_call.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cu_safe_call.h	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/bilateral_filter.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/blend.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/integral_image.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/lbp.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/split_merge.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/stereobp.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuvid_video_source.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuvid_video_source.h	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/error.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/fast.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/ffmpeg_video_source.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/ffmpeg_video_source.h	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/gftt.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/global_motion.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/hog.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/matrix_reductions.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/mssegmentation.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/nvidia/NCVHaarObjectDetection.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/nvidia/NCVHaarObjectDetection.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/nvidia/core/NCV.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/nvidia/core/NCV.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/optical_flow.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/optical_flow_farneback.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/orb.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/pyrlk.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/speckle_filtering.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/split_merge.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/stereobp.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/stereocsbp.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/tvl1flow.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/video_reader.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/interpolation.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/main.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/nvidia/NCVTestSourceProvider.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/nvidia/main_nvidia.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/test_bgfg.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/test_stream.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/include/opencv2/imgproc.hpp	diff1 \|	\|	blob \| history
modules/imgproc/include/opencv2/imgproc/imgproc.hpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/histogram.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/cpp/features2d_manual.hpp	diff1 \|	diff2 \|	blob \| history
modules/ml/src/svm.cpp	diff1 \|	diff2 \|	blob \| history
modules/ml/test/test_mltests2.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/include/opencv2/nonfree/gpu.hpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/perf/perf_gpu.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/src/opencl/surf.cl	diff1 \|	diff2 \|	blob \| history
modules/nonfree/src/surf.ocl.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/src/surf_gpu.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl/private/util.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/brute_force_matcher.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/canny.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/haar.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/initialization.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/match_template.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/moments.cpp	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/superres/include/opencv2/superres.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/include/opencv2/superres/optical_flow.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/btv_l1.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/btv_l1_gpu.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/frame_source.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/input_array_utility.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/input_array_utility.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/optical_flow.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/super_resolution.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts/gpu_perf.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts/gpu_test.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/src/gpu_perf.cpp	diff1 \|	diff2 \|	blob \| history
modules/world/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
samples/cpp/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Uncategorized;

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsGrfmt.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVModule.cmake	diff1 \|	diff2 \|	blob \| history
doc/tutorials/introduction/windows_visual_studio_image_watch/windows_visual_studio_image_watch.rst	\|	diff2 \|	blob \| history
modules/core/include/opencv2/core/cuda_devptrs.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/gpumat.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/opengl.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/operations.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/stream_accessor.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/gl_core_3_1.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_io.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/gpu/include/opencv2/gpu.hpp	diff1 \|	\|	blob \| history
modules/gpu/include/opencv2/gpu/gpu.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/perf/perf_calib3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/perf/perf_video.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/perf4au/main.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/bilateral_filter.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/blend.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/brute_force_matcher.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cascadeclassifier.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cu_safe_call.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cu_safe_call.h	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/bilateral_filter.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/blend.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/integral_image.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/lbp.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/split_merge.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuda/stereobp.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuvid_video_source.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/cuvid_video_source.h	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/error.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/fast.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/ffmpeg_video_source.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/ffmpeg_video_source.h	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/gftt.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/global_motion.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/hog.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/matrix_reductions.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/mssegmentation.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/nvidia/NCVHaarObjectDetection.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/nvidia/NCVHaarObjectDetection.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/nvidia/core/NCV.cu	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/nvidia/core/NCV.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/optical_flow.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/optical_flow_farneback.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/orb.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/pyrlk.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/speckle_filtering.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/split_merge.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/stereobp.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/stereocsbp.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/tvl1flow.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/video_reader.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/interpolation.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/main.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/nvidia/NCVTestSourceProvider.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/nvidia/main_nvidia.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/test_bgfg.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/test/test_stream.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/include/opencv2/imgproc.hpp	diff1 \|	\|	blob \| history
modules/imgproc/include/opencv2/imgproc/imgproc.hpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/histogram.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/cpp/features2d_manual.hpp	diff1 \|	diff2 \|	blob \| history
modules/ml/src/svm.cpp	diff1 \|	diff2 \|	blob \| history
modules/ml/test/test_mltests2.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/include/opencv2/nonfree/gpu.hpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/perf/perf_gpu.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/src/opencl/surf.cl	diff1 \|	diff2 \|	blob \| history
modules/nonfree/src/surf.ocl.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/src/surf_gpu.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl/private/util.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/brute_force_matcher.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/canny.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/haar.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/initialization.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/match_template.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/moments.cpp	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/superres/include/opencv2/superres.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/include/opencv2/superres/optical_flow.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/btv_l1.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/btv_l1_gpu.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/frame_source.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/input_array_utility.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/input_array_utility.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/optical_flow.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/super_resolution.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts/gpu_perf.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts/gpu_test.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/src/gpu_perf.cpp	diff1 \|	diff2 \|	blob \| history
modules/world/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
samples/cpp/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history