review.tizen.org Git - platform/upstream/opencv.git/commit

projects / platform / upstream / opencv.git / commit

author	Roman Donchenko <roman.donchenko@itseez.com>
	Tue, 27 Aug 2013 09:26:44 +0000 (13:26 +0400)
committer	Roman Donchenko <roman.donchenko@itseez.com>
	Tue, 27 Aug 2013 09:26:44 +0000 (13:26 +0400)
commit	2c4bbb313c29daf0d10c34128cd6eac1de8111de
tree	67e3f6919c9b2f5b676ff7cf4cbc0de5e64927e4	tree \| snapshot
parent	4d06c4c7b6a46940cfc724d59e6e78670d96d0b1	commit \| diff
parent	43aec5ad4ad4460ad588d674263920df8c1ecb2e	commit \| diff

Merge commit '43aec5ad' into merge-2.4

Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py

195 files changed:

3rdparty/ffmpeg/ffmpeg_version.cmake	diff1 \|	diff2 \|	blob \| history
CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
apps/haartraining/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
apps/haartraining/_cvcommon.h	diff1 \|	diff2 \|	blob \| history
apps/haartraining/performance.cpp	diff1 \|	diff2 \|	blob \| history
apps/traincascade/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVCompilerOptions.cmake	diff1 \|	diff2 \|	blob \| history
doc/_themes/blue/static/default.css_t	diff1 \|	diff2 \|	blob \| history
doc/check_docs.py	diff1 \|	diff2 \|	blob \| history
doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/feature_description/feature_description.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/histograms/template_matching/template_matching.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/imgtrans/remap/remap.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/pyramids/pyramids.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/hull/hull.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/moments/moments.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/introduction/linux_install/linux_install.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst	diff1 \|	diff2 \|	blob \| history
include/opencv/cv.h	diff1 \|	diff2 \|	blob \| history
modules/androidcamera/include/camera_activity.hpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/src/epnp.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/src/p3p.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/src/solvepnp.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_affine3d_estimator.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_cameracalibration_badarg.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_chessboardgenerator.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_reproject_image_to_3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_solvepnp_ransac.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/adaptiveskindetector.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/bowmsctrainer.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/chowliutree.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/colortracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/detection_based_tracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/featuretracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/fuzzymeanshifttracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/hybridtracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/lda.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/logpolar_bsm.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/stereovar.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/doc/basic_structures.rst	diff1 \|	diff2 \|	blob \| history
modules/core/doc/core.rst	diff1 \|	diff2 \|	blob \| history
modules/core/doc/dynamic_structures.rst	diff1 \|	diff2 \|	blob \| history
modules/core/doc/old_basic_structures.rst	diff1 \|	diff2 \|	blob \| history
modules/core/src/convert.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/lapack.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/stat.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_io.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_math.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/perf/perf_fast.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/src/bagofwords.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/src/evaluation.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/test/test_brisk.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/test/test_fast.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/test/test_keypoints.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/test/test_mser.cpp	diff1 \|	diff2 \|	blob \| history
modules/flann/src/flann.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/doc/data_structures.rst	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/calib3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/doc/qt_new_functions.rst	diff1 \|	diff2 \|	blob \| history
modules/highgui/doc/reading_and_writing_images_and_video.rst	diff1 \|	diff2 \|	blob \| history
modules/highgui/perf/perf_input.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_avfoundation.mm	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_ffmpeg_api.hpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_qtkit.mm	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/grfmt_bmp.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/window_QT.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_fourcc.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_positioning.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/doc/filtering.rst	diff1 \|	diff2 \|	blob \| history
modules/imgproc/doc/geometric_transformations.rst	diff1 \|	diff2 \|	blob \| history
modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/perf/perf_cornerHarris.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/perf/perf_filter2d.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/morph.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/test/test_distancetransform.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/cpp/common.h	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/cpp/core_manual.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/cpp/jni_part.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/cpp/utils.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst	diff1 \|	diff2 \|	blob \| history
modules/legacy/doc/common_interfaces_of_generic_descriptor_matchers.rst	diff1 \|	diff2 \|	blob \| history
modules/legacy/doc/histograms.rst	diff1 \|	diff2 \|	blob \| history
modules/legacy/doc/motion_analysis.rst	diff1 \|	diff2 \|	blob \| history
modules/legacy/doc/planar_subdivisions.rst	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/_vm.h	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/bgfg_gaussmix.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/blobtrackpostprockalman.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/calibfilter.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/dpstereo.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/epilines.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/features2d.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/lcm.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/testseq.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/trifocal.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/vecfacetracking.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/test/test_bruteforcematcher.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/test/test_optflow.cpp	diff1 \|	diff2 \|	blob \| history
modules/ml/src/ertrees.cpp	diff1 \|	diff2 \|	blob \| history
modules/ml/src/svm.cpp	diff1 \|	diff2 \|	blob \| history
modules/ml/test/test_emknearestkmeans.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/test/test_detectors.cpp	diff1 \|	diff2 \|	blob \| history
modules/objdetect/doc/latent_svm.rst	diff1 \|	diff2 \|	blob \| history
modules/objdetect/src/cascadedetect.hpp	diff1 \|	diff2 \|	blob \| history
modules/objdetect/src/featurepyramid.cpp	diff1 \|	diff2 \|	blob \| history
modules/objdetect/src/haar.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/doc/image_filtering.rst	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl/private/util.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_calib3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_canny.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/blend.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/columnsum.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/pyrdown.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/pyrup.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_imgproc.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/photo/src/arrays.hpp	diff1 \|	diff2 \|	blob \| history
modules/photo/src/denoising.cpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/src/motion_estimators.cpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/src/seam_finders.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/btv_l1_ocl.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/bgfg_gaussmix.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/kalman.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/simpleflow.cpp	diff1 \|	diff2 \|	blob \| history
modules/videostab/src/precomp.hpp	diff1 \|	diff2 \|	blob \| history
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java	diff1 \|	diff2 \|	blob \| history
samples/android/hello-android/main.cpp	diff1 \|	diff2 \|	blob \| history
samples/c/adaptiveskindetector.cpp	diff1 \|	diff2 \|	blob \| history
samples/c/blobtrack_sample.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/bgfg_gmg.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/calibration_artificial.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/dft.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/houghlines.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/phase_corr.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/retinaDemo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/stereo_calib.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/stitching.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/stitching_detailed.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ImgProc/Pyramids.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/core/discrete_fourier_transform/discrete_fourier_transform.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/core/mat_the_basic_image_container/mat_the_basic_image_container.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp	diff1 \|	diff2 \|	blob \| history
samples/gpu/hog.cpp	diff1 \|	diff2 \|	blob \| history
samples/gpu/houghlines.cpp	diff1 \|	diff2 \|	blob \| history
samples/gpu/stereo_match.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/facedetect.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/tvl1_optical_flow.cpp	diff1 \|	diff2 \|	blob \| history
samples/python2/asift.py	diff1 \|	diff2 \|	blob \| history
samples/python2/calibrate.py	diff1 \|	diff2 \|	blob \| history
samples/python2/camshift.py	diff1 \|	diff2 \|	blob \| history
samples/python2/common.py	diff1 \|	diff2 \|	blob \| history
samples/python2/deconvolution.py	diff1 \|	diff2 \|	blob \| history
samples/python2/demo.py	diff1 \|	diff2 \|	blob \| history
samples/python2/distrans.py	diff1 \|	diff2 \|	blob \| history
samples/python2/edge.py	diff1 \|	diff2 \|	blob \| history
samples/python2/facedetect.py	diff1 \|	diff2 \|	blob \| history
samples/python2/hist.py	diff1 \|	diff2 \|	blob \| history
samples/python2/inpaint.py	diff1 \|	diff2 \|	blob \| history
samples/python2/lappyr.py	diff1 \|	diff2 \|	blob \| history
samples/python2/opt_flow.py	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Vision;

RSS Atom

3rdparty/ffmpeg/ffmpeg_version.cmake	diff1 \|	diff2 \|	blob \| history
CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
apps/haartraining/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
apps/haartraining/_cvcommon.h	diff1 \|	diff2 \|	blob \| history
apps/haartraining/performance.cpp	diff1 \|	diff2 \|	blob \| history
apps/traincascade/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVCompilerOptions.cmake	diff1 \|	diff2 \|	blob \| history
doc/_themes/blue/static/default.css_t	diff1 \|	diff2 \|	blob \| history
doc/check_docs.py	diff1 \|	diff2 \|	blob \| history
doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/feature_description/feature_description.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/histograms/template_matching/template_matching.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/imgtrans/remap/remap.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/pyramids/pyramids.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/hull/hull.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/moments/moments.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/introduction/linux_install/linux_install.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst	diff1 \|	diff2 \|	blob \| history
include/opencv/cv.h	diff1 \|	diff2 \|	blob \| history
modules/androidcamera/include/camera_activity.hpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/src/epnp.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/src/p3p.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/src/solvepnp.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_affine3d_estimator.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_cameracalibration_badarg.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_chessboardgenerator.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_reproject_image_to_3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_solvepnp_ransac.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/adaptiveskindetector.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/bowmsctrainer.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/chowliutree.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/colortracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/detection_based_tracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/featuretracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/fuzzymeanshifttracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/hybridtracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/lda.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/logpolar_bsm.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/stereovar.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/doc/basic_structures.rst	diff1 \|	diff2 \|	blob \| history
modules/core/doc/core.rst	diff1 \|	diff2 \|	blob \| history
modules/core/doc/dynamic_structures.rst	diff1 \|	diff2 \|	blob \| history
modules/core/doc/old_basic_structures.rst	diff1 \|	diff2 \|	blob \| history
modules/core/src/convert.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/lapack.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/stat.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_io.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_math.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/perf/perf_fast.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/src/bagofwords.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/src/evaluation.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/test/test_brisk.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/test/test_fast.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/test/test_keypoints.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/test/test_mser.cpp	diff1 \|	diff2 \|	blob \| history
modules/flann/src/flann.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/doc/data_structures.rst	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/calib3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/doc/qt_new_functions.rst	diff1 \|	diff2 \|	blob \| history
modules/highgui/doc/reading_and_writing_images_and_video.rst	diff1 \|	diff2 \|	blob \| history
modules/highgui/perf/perf_input.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_avfoundation.mm	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_ffmpeg_api.hpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_qtkit.mm	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/grfmt_bmp.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/window_QT.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_fourcc.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_positioning.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/doc/filtering.rst	diff1 \|	diff2 \|	blob \| history
modules/imgproc/doc/geometric_transformations.rst	diff1 \|	diff2 \|	blob \| history
modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/perf/perf_cornerHarris.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/perf/perf_filter2d.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/morph.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/test/test_distancetransform.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/cpp/common.h	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/cpp/core_manual.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/cpp/jni_part.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/cpp/utils.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst	diff1 \|	diff2 \|	blob \| history
modules/legacy/doc/common_interfaces_of_generic_descriptor_matchers.rst	diff1 \|	diff2 \|	blob \| history
modules/legacy/doc/histograms.rst	diff1 \|	diff2 \|	blob \| history
modules/legacy/doc/motion_analysis.rst	diff1 \|	diff2 \|	blob \| history
modules/legacy/doc/planar_subdivisions.rst	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/_vm.h	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/bgfg_gaussmix.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/blobtrackpostprockalman.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/calibfilter.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/dpstereo.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/epilines.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/features2d.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/lcm.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/testseq.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/trifocal.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/vecfacetracking.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/test/test_bruteforcematcher.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/test/test_optflow.cpp	diff1 \|	diff2 \|	blob \| history
modules/ml/src/ertrees.cpp	diff1 \|	diff2 \|	blob \| history
modules/ml/src/svm.cpp	diff1 \|	diff2 \|	blob \| history
modules/ml/test/test_emknearestkmeans.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/test/test_detectors.cpp	diff1 \|	diff2 \|	blob \| history
modules/objdetect/doc/latent_svm.rst	diff1 \|	diff2 \|	blob \| history
modules/objdetect/src/cascadedetect.hpp	diff1 \|	diff2 \|	blob \| history
modules/objdetect/src/featurepyramid.cpp	diff1 \|	diff2 \|	blob \| history
modules/objdetect/src/haar.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/doc/image_filtering.rst	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl/private/util.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_calib3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_canny.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/blend.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/columnsum.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/pyrdown.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/pyrup.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_imgproc.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/photo/src/arrays.hpp	diff1 \|	diff2 \|	blob \| history
modules/photo/src/denoising.cpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/src/motion_estimators.cpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/src/seam_finders.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/btv_l1_ocl.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/bgfg_gaussmix.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/kalman.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/simpleflow.cpp	diff1 \|	diff2 \|	blob \| history
modules/videostab/src/precomp.hpp	diff1 \|	diff2 \|	blob \| history
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionActivity.java	diff1 \|	diff2 \|	blob \| history
samples/android/hello-android/main.cpp	diff1 \|	diff2 \|	blob \| history
samples/c/adaptiveskindetector.cpp	diff1 \|	diff2 \|	blob \| history
samples/c/blobtrack_sample.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/bgfg_gmg.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/calibration_artificial.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/dft.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/houghlines.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/phase_corr.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/retinaDemo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/stereo_calib.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/stitching.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/stitching_detailed.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ImgProc/Pyramids.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/core/discrete_fourier_transform/discrete_fourier_transform.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/core/mat_the_basic_image_container/mat_the_basic_image_container.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp	diff1 \|	diff2 \|	blob \| history
samples/gpu/hog.cpp	diff1 \|	diff2 \|	blob \| history
samples/gpu/houghlines.cpp	diff1 \|	diff2 \|	blob \| history
samples/gpu/stereo_match.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/facedetect.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/tvl1_optical_flow.cpp	diff1 \|	diff2 \|	blob \| history
samples/python2/asift.py	diff1 \|	diff2 \|	blob \| history
samples/python2/calibrate.py	diff1 \|	diff2 \|	blob \| history
samples/python2/camshift.py	diff1 \|	diff2 \|	blob \| history
samples/python2/common.py	diff1 \|	diff2 \|	blob \| history
samples/python2/deconvolution.py	diff1 \|	diff2 \|	blob \| history
samples/python2/demo.py	diff1 \|	diff2 \|	blob \| history
samples/python2/distrans.py	diff1 \|	diff2 \|	blob \| history
samples/python2/edge.py	diff1 \|	diff2 \|	blob \| history
samples/python2/facedetect.py	diff1 \|	diff2 \|	blob \| history
samples/python2/hist.py	diff1 \|	diff2 \|	blob \| history
samples/python2/inpaint.py	diff1 \|	diff2 \|	blob \| history
samples/python2/lappyr.py	diff1 \|	diff2 \|	blob \| history
samples/python2/opt_flow.py	diff1 \|	diff2 \|	blob \| history