projects / platform / upstream / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 17f53bc 3ff1620)
Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 3 Dec 2013 11:50:44 +0000 (15:50 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 3 Dec 2013 13:35:21 +0000 (17:35 +0400)
commitd58cd9851fdb592a395488fc5721d11c7436a99c
tree5bf571d309a7496d30d4bf80ffb7f3050b5ca34atree | snapshot
parent17f53bc30129196d1f52097e9bfa450e10f471fccommit | diff
parent3ff16200867d1c659efd17bb8bfee633366f7b05commit | diff
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
67 files changed:
CMakeLists.txt diff1 | diff2 | blob | history
apps/traincascade/boost.cpp diff1 | diff2 | blob | history
apps/traincascade/cascadeclassifier.cpp diff1 | diff2 | blob | history
cmake/OpenCVCompilerOptions.cmake diff1 | diff2 | blob | history
cmake/OpenCVDetectCUDA.cmake diff1 | diff2 | blob | history
doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.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/erosion_dilatation/erosion_dilatation.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/histograms/back_projection/back_projection.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.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/copyMakeBorder/copyMakeBorder.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/imgtrans/remap/remap.rst diff1 | diff2 | blob | history
doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.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/imgproc/threshold/threshold.rst diff1 | diff2 | blob | history
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst diff1 | diff2 | blob | history
doc/user_guide/ug_highgui.rst diff1 | diff2 | blob | history
modules/contrib/doc/facerec/src/facerec_eigenfaces.cpp diff1 | diff2 | blob | history
modules/contrib/doc/facerec/src/facerec_fisherfaces.cpp diff1 | diff2 | blob | history
modules/contrib/doc/facerec/src/facerec_save_load.cpp diff1 | diff2 | blob | history
modules/contrib/src/facerec.cpp diff1 | diff2 | blob | history
modules/core/doc/basic_structures.rst diff1 | diff2 | blob | history
modules/core/src/command_line_parser.cpp diff1 | | blob | history
modules/cuda/CMakeLists.txt diff1 | | blob | history
modules/cuda/doc/introduction.rst diff1 | | blob | history
modules/cudaarithm/CMakeLists.txt diff1 | | blob | history
modules/cudabgsegm/CMakeLists.txt diff1 | | blob | history
modules/cudabgsegm/perf/perf_bgsegm.cpp diff1 | | blob | history
modules/cudacodec/CMakeLists.txt diff1 | | blob | history
modules/cudafeatures2d/CMakeLists.txt diff1 | | blob | history
modules/cudafilters/CMakeLists.txt diff1 | | blob | history
modules/cudaimgproc/CMakeLists.txt diff1 | | blob | history
modules/cudaoptflow/CMakeLists.txt diff1 | | blob | history
modules/cudastereo/CMakeLists.txt diff1 | | blob | history
modules/cudawarping/CMakeLists.txt diff1 | | blob | history
modules/highgui/doc/reading_and_writing_images_and_video.rst diff1 | diff2 | blob | history
modules/highgui/doc/user_interface.rst diff1 | diff2 | blob | history
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst diff1 | diff2 | blob | history
modules/objdetect/doc/cascade_classification.rst diff1 | diff2 | blob | history
modules/ocl/include/opencv2/ocl/matrix_operations.hpp diff1 | diff2 | blob | history
modules/ocl/src/cl_context.cpp diff1 | diff2 | blob | history
modules/ocl/src/cl_operations.cpp diff1 | diff2 | blob | history
modules/ocl/src/haar.cpp diff1 | diff2 | blob | history
modules/ocl/src/mssegmentation.cpp diff1 | diff2 | blob | history
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp diff1 | diff2 | blob | history
samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp diff1 | diff2 | blob | history
samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp diff1 | diff2 | blob | history
Domain: Multimedia / Media Vision;