Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 13 Aug 2013 08:56:39 +0000 (12:56 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 13 Aug 2013 08:56:39 +0000 (12:56 +0400)
commit6b5ac42a9b3e59661dd40e0f535ada951188876b
treea59bb66a693011d5be66655977436c9fefe13441
parentd8c6e89a54df6c0db529431b4188e6cb8ff53d7a
parent57c1e8f3334b80c091dbdf24e89c4f29472d3301
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
55 files changed:
cmake/OpenCVDetectPython.cmake
modules/androidcamera/src/camera_activity.cpp
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/contrib/doc/facerec/facerec_api.rst
modules/core/doc/basic_structures.rst
modules/core/doc/clustering.rst
modules/core/doc/drawing_functions.rst
modules/core/doc/operations_on_arrays.rst
modules/core/doc/xml_yaml_persistence.rst
modules/core/src/stat.cpp
modules/core/test/test_arithm.cpp
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/object_detection.rst
modules/gpubgsegm/doc/background_segmentation.rst
modules/gpucodec/doc/videodec.rst
modules/gpucodec/doc/videoenc.rst
modules/gpufilters/doc/filtering.rst
modules/gpuimgproc/doc/color.rst
modules/gpuimgproc/doc/hough.rst
modules/gpuoptflow/doc/optflow.rst
modules/gpustereo/doc/stereo.rst
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/highgui/doc/user_interface.rst
modules/highgui/src/cap_dshow.cpp
modules/highgui/src/cap_ffmpeg_impl.hpp
modules/imgproc/doc/feature_detection.rst
modules/imgproc/doc/filtering.rst
modules/imgproc/doc/geometric_transformations.rst
modules/imgproc/doc/histograms.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/morph.cpp
modules/imgproc/src/samplers.cpp
modules/imgproc/src/smooth.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/doc/support_vector_machines.rst
modules/nonfree/doc/feature_detection.rst
modules/objdetect/doc/cascade_classification.rst
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl.hpp
modules/photo/doc/inpainting.rst
modules/stitching/doc/high_level.rst
modules/ts/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/video/doc/motion_analysis_and_object_tracking.rst
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml