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

projects / profile / ivi / opencv.git / commit

author	Vladislav Vinogradov <vlad.vinogradov@itseez.com>
	Fri, 6 Sep 2013 11:44:44 +0000 (15:44 +0400)
committer	Vladislav Vinogradov <vlad.vinogradov@itseez.com>
	Fri, 6 Sep 2013 11:44:44 +0000 (15:44 +0400)
commit	0c7663eb3bfe2a0e11f786f7d3e3dc4467b285d2
tree	94ba55ff4c07d17fdff8e0ba1e9c0211ccb25307	tree \| snapshot
parent	f46b7fcf86cf7659b6b7ef1d07ca4bc6e262eee4	commit \| diff

Merge branch 'master' into gpu-cuda-rename

Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp

184 files changed:

apps/traincascade/boost.cpp		diff \| blob \| history
apps/traincascade/cascadeclassifier.cpp		diff \| blob \| history
apps/traincascade/traincascade.cpp		diff \| blob \| history
modules/bioinspired/src/opencl/retina_kernel.cl		diff \| blob \| history
modules/bioinspired/src/retina.cpp		diff \| blob \| history
modules/bioinspired/src/retina_ocl.cpp		diff \| blob \| history
modules/bioinspired/src/retinafasttonemapping.cpp		diff \| blob \| history
modules/bioinspired/test/test_retina_ocl.cpp		diff \| blob \| history
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst		diff \| blob \| history
modules/calib3d/include/opencv2/calib3d.hpp		diff \| blob \| history
modules/calib3d/perf/perf_pnp.cpp		diff \| blob \| history
modules/calib3d/src/calibinit.cpp		diff \| blob \| history
modules/calib3d/src/calibration.cpp		diff \| blob \| history
modules/calib3d/src/compat_ptsetreg.cpp		diff \| blob \| history
modules/calib3d/src/five-point.cpp		diff \| blob \| history
modules/calib3d/src/fundam.cpp		diff \| blob \| history
modules/calib3d/src/levmarq.cpp		diff \| blob \| history
modules/calib3d/src/ptsetreg.cpp		diff \| blob \| history
modules/calib3d/src/stereobm.cpp		diff \| blob \| history
modules/calib3d/src/stereosgbm.cpp		diff \| blob \| history
modules/calib3d/src/triangulate.cpp		diff \| blob \| history
modules/calib3d/test/test_solvepnp_ransac.cpp		diff \| blob \| history
modules/contrib/src/detection_based_tracker.cpp		diff \| blob \| history
modules/contrib/src/facerec.cpp		diff \| blob \| history
modules/contrib/src/featuretracker.cpp		diff \| blob \| history
modules/core/doc/basic_structures.rst		diff \| blob \| history
modules/core/doc/intro.rst		diff \| blob \| history
modules/core/include/opencv2/core/core_c.h		diff \| blob \| history
modules/core/include/opencv2/core/cuda.hpp		diff \| blob \| history
modules/core/include/opencv2/core/cvstd.hpp		diff \| blob \| history
modules/core/include/opencv2/core/opengl.hpp		diff \| blob \| history
modules/core/include/opencv2/core/operations.hpp		diff \| blob \| history
modules/core/include/opencv2/core/persistence.hpp		diff \| blob \| history
modules/core/include/opencv2/core/private.hpp		diff \| blob \| history
modules/core/include/opencv2/core/ptr.inl.hpp	[new file with mode: 0644]	blob
modules/core/include/opencv2/core/types.hpp		diff \| blob \| history
modules/core/src/algorithm.cpp		diff \| blob \| history
modules/core/src/array.cpp		diff \| blob \| history
modules/core/src/cuda_stream.cpp		diff \| blob \| history
modules/core/src/opengl.cpp		diff \| blob \| history
modules/core/src/out.cpp		diff \| blob \| history
modules/core/src/persistence.cpp		diff \| blob \| history
modules/core/test/test_ds.cpp		diff \| blob \| history
modules/core/test/test_io.cpp		diff \| blob \| history
modules/core/test/test_mat.cpp		diff \| blob \| history
modules/core/test/test_ptr.cpp	[new file with mode: 0644]	blob
modules/cuda/src/cascadeclassifier.cpp		diff \| blob \| history
modules/cudaarithm/src/arithm.cpp		diff \| blob \| history
modules/cudaarithm/src/core.cpp		diff \| blob \| history
modules/cudabgsegm/perf/perf_bgsegm.cpp		diff \| blob \| history
modules/cudabgsegm/src/fgd.cpp		diff \| blob \| history
modules/cudabgsegm/src/gmg.cpp		diff \| blob \| history
modules/cudabgsegm/src/mog.cpp		diff \| blob \| history
modules/cudabgsegm/src/mog2.cpp		diff \| blob \| history
modules/cudabgsegm/test/test_bgsegm.cpp		diff \| blob \| history
modules/cudacodec/src/thread.cpp		diff \| blob \| history
modules/cudacodec/src/thread.hpp		diff \| blob \| history
modules/cudafilters/src/filtering.cpp		diff \| blob \| history
modules/cudaimgproc/src/canny.cpp		diff \| blob \| history
modules/cudaimgproc/src/corners.cpp		diff \| blob \| history
modules/cudaimgproc/src/generalized_hough.cpp		diff \| blob \| history
modules/cudaimgproc/src/gftt.cpp		diff \| blob \| history
modules/cudaimgproc/src/histogram.cpp		diff \| blob \| history
modules/cudaimgproc/src/hough_circles.cpp		diff \| blob \| history
modules/cudaimgproc/src/hough_lines.cpp		diff \| blob \| history
modules/cudaimgproc/src/hough_segments.cpp		diff \| blob \| history
modules/cudaimgproc/src/match_template.cpp		diff \| blob \| history
modules/cudalegacy/src/cuda/NCVHaarObjectDetection.cu		diff \| blob \| history
modules/cudastereo/src/disparity_bilateral_filter.cpp		diff \| blob \| history
modules/cudastereo/src/stereobm.cpp		diff \| blob \| history
modules/cudastereo/src/stereobp.cpp		diff \| blob \| history
modules/cudastereo/src/stereocsbp.cpp		diff \| blob \| history
modules/cudawarping/src/pyramids.cpp		diff \| blob \| history
modules/features2d/include/opencv2/features2d.hpp		diff \| blob \| history
modules/features2d/src/brisk.cpp		diff \| blob \| history
modules/features2d/src/descriptors.cpp		diff \| blob \| history
modules/features2d/src/detectors.cpp		diff \| blob \| history
modules/features2d/src/dynamic.cpp		diff \| blob \| history
modules/features2d/src/evaluation.cpp		diff \| blob \| history
modules/features2d/src/matchers.cpp		diff \| blob \| history
modules/features2d/test/test_descriptors_regression.cpp		diff \| blob \| history
modules/features2d/test/test_detectors_regression.cpp		diff \| blob \| history
modules/features2d/test/test_keypoints.cpp		diff \| blob \| history
modules/features2d/test/test_rotation_and_scale_invariance.cpp		diff \| blob \| history
modules/highgui/doc/user_interface.rst		diff \| blob \| history
modules/highgui/include/opencv2/highgui.hpp		diff \| blob \| history
modules/highgui/src/cap.cpp		diff \| blob \| history
modules/highgui/src/grfmt_bmp.cpp		diff \| blob \| history
modules/highgui/src/grfmt_exr.cpp		diff \| blob \| history
modules/highgui/src/grfmt_jpeg.cpp		diff \| blob \| history
modules/highgui/src/grfmt_jpeg2000.cpp		diff \| blob \| history
modules/highgui/src/grfmt_png.cpp		diff \| blob \| history
modules/highgui/src/grfmt_pxm.cpp		diff \| blob \| history
modules/highgui/src/grfmt_sunras.cpp		diff \| blob \| history
modules/highgui/src/grfmt_tiff.cpp		diff \| blob \| history
modules/highgui/src/grfmt_webp.cpp		diff \| blob \| history
modules/highgui/src/loadsave.cpp		diff \| blob \| history
modules/highgui/test/test_framecount.cpp		diff \| blob \| history
modules/imgproc/include/opencv2/imgproc.hpp		diff \| blob \| history
modules/imgproc/src/clahe.cpp		diff \| blob \| history
modules/imgproc/src/contours.cpp		diff \| blob \| history
modules/imgproc/src/filter.cpp		diff \| blob \| history
modules/imgproc/src/generalized_hough.cpp		diff \| blob \| history
modules/imgproc/src/hough.cpp		diff \| blob \| history
modules/imgproc/src/imgwarp.cpp		diff \| blob \| history
modules/imgproc/src/lsd.cpp		diff \| blob \| history
modules/imgproc/src/morph.cpp		diff \| blob \| history
modules/imgproc/src/smooth.cpp		diff \| blob \| history
modules/imgproc/test/test_convhull.cpp		diff \| blob \| history
modules/java/generator/src/cpp/features2d_manual.hpp		diff \| blob \| history
modules/legacy/src/em.cpp		diff \| blob \| history
modules/legacy/src/features2d.cpp		diff \| blob \| history
modules/legacy/src/kdtree.cpp		diff \| blob \| history
modules/legacy/src/oneway.cpp		diff \| blob \| history
modules/legacy/src/planardetect.cpp		diff \| blob \| history
modules/ml/include/opencv2/ml.hpp		diff \| blob \| history
modules/ml/src/ml_init.cpp		diff \| blob \| history
modules/ml/src/rtrees.cpp		diff \| blob \| history
modules/ml/src/tree.cpp		diff \| blob \| history
modules/nonfree/src/nonfree_init.cpp		diff \| blob \| history
modules/nonfree/test/test_features2d.cpp		diff \| blob \| history
modules/nonfree/test/test_keypoints.cpp		diff \| blob \| history
modules/nonfree/test/test_rotation_and_scale_invariance.cpp		diff \| blob \| history
modules/objdetect/include/opencv2/objdetect.hpp		diff \| blob \| history
modules/objdetect/include/opencv2/objdetect/erfilter.hpp		diff \| blob \| history
modules/objdetect/src/cascadedetect.cpp		diff \| blob \| history
modules/objdetect/src/erfilter.cpp		diff \| blob \| history
modules/objdetect/src/haar.cpp		diff \| blob \| history
modules/objdetect/src/hog.cpp		diff \| blob \| history
modules/objdetect/src/linemod.cpp		diff \| blob \| history
modules/objdetect/test/test_cascadeandhog.cpp		diff \| blob \| history
modules/ocl/src/filtering.cpp		diff \| blob \| history
modules/ocl/src/imgproc.cpp		diff \| blob \| history
modules/ocl/src/mcwutil.cpp		diff \| blob \| history
modules/photo/src/inpaint.cpp		diff \| blob \| history
modules/python/src2/cv2.cpp		diff \| blob \| history
modules/python/src2/gen2.py		diff \| blob \| history
modules/softcascade/src/detector_cuda.cpp		diff \| blob \| history
modules/softcascade/src/softcascade_init.cpp		diff \| blob \| history
modules/stitching/include/opencv2/stitching/warpers.hpp		diff \| blob \| history
modules/stitching/perf/perf_stich.cpp		diff \| blob \| history
modules/stitching/src/blenders.cpp		diff \| blob \| history
modules/stitching/src/exposure_compensate.cpp		diff \| blob \| history
modules/stitching/src/matchers.cpp		diff \| blob \| history
modules/stitching/src/stitcher.cpp		diff \| blob \| history
modules/stitching/test/test_matchers.cpp		diff \| blob \| history
modules/superres/perf/perf_superres.cpp		diff \| blob \| history
modules/superres/perf/perf_superres_ocl.cpp		diff \| blob \| history
modules/superres/src/btv_l1.cpp		diff \| blob \| history
modules/superres/src/btv_l1_cuda.cpp		diff \| blob \| history
modules/superres/src/btv_l1_ocl.cpp		diff \| blob \| history
modules/superres/src/frame_source.cpp		diff \| blob \| history
modules/superres/src/optical_flow.cpp		diff \| blob \| history
modules/superres/test/test_superres.cpp		diff \| blob \| history
modules/video/src/bgfg_gaussmix.cpp		diff \| blob \| history
modules/video/src/bgfg_gaussmix2.cpp		diff \| blob \| history
modules/video/src/bgfg_gmg.cpp		diff \| blob \| history
modules/video/src/tvl1flow.cpp		diff \| blob \| history
modules/video/test/test_backgroundsubtractor_gbh.cpp		diff \| blob \| history
modules/videostab/src/frame_source.cpp		diff \| blob \| history
modules/videostab/src/global_motion.cpp		diff \| blob \| history
modules/videostab/src/inpainting.cpp		diff \| blob \| history
modules/videostab/src/motion_stabilizing.cpp		diff \| blob \| history
modules/videostab/src/stabilizer.cpp		diff \| blob \| history
modules/videostab/src/wobble_suppression.cpp		diff \| blob \| history
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp		diff \| blob \| history
samples/cpp/bagofwords_classification.cpp		diff \| blob \| history
samples/cpp/bgfg_gmg.cpp		diff \| blob \| history
samples/cpp/dbt_face_detection.cpp		diff \| blob \| history
samples/cpp/descriptor_extractor_matcher.cpp		diff \| blob \| history
samples/cpp/detection_based_tracker_sample.cpp		diff \| blob \| history
samples/cpp/detector_descriptor_evaluation.cpp		diff \| blob \| history
samples/cpp/fabmap_sample.cpp		diff \| blob \| history
samples/cpp/generic_descriptor_match.cpp		diff \| blob \| history
samples/cpp/image.cpp		diff \| blob \| history
samples/cpp/linemod.cpp		diff \| blob \| history
samples/cpp/matching_to_many_images.cpp		diff \| blob \| history
samples/cpp/stitching_detailed.cpp		diff \| blob \| history
samples/cpp/tutorial_code/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.cpp		diff \| blob \| history
samples/cpp/video_homography.cpp		diff \| blob \| history
samples/cpp/videostab.cpp		diff \| blob \| history
samples/gpu/performance/tests.cpp		diff \| blob \| history
samples/gpu/stereo_multi.cpp		diff \| blob \| history
samples/gpu/super_resolution.cpp		diff \| blob \| history

Domain: Multimedia / Uncategorized;

RSS Atom