Roman Donchenko cc05493730 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: cmake/OpenCVDetectAndroidSDK.cmake cmake/OpenCVGenAndroidMK.cmake cmake/OpenCVModule.cmake cmake/templates/OpenCV.mk.in cmake/templates/OpenCVConfig.cmake.in doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst modules/cudabgsegm/src/cuda/mog.cu modules/imgproc/perf/opencl/perf_filters.cpp modules/imgproc/src/opencl/filterSep_singlePass.cl modules/nonfree/CMakeLists.txt modules/nonfree/perf/perf_precomp.hpp modules/ocl/perf/perf_haar.cpp modules/ocl/src/filtering.cpp modules/ocl/src/opencl/bgfg_mog.cl modules/superres/CMakeLists.txt modules/superres/src/btv_l1_cuda.cpp modules/superres/src/cuda/btv_l1_gpu.cu modules/superres/src/frame_source.cpp modules/superres/src/input_array_utility.cpp modules/superres/src/optical_flow.cpp modules/superres/src/precomp.hpp samples/gpu/CMakeLists.txt samples/gpu/brox_optical_flow.cpp samples/gpu/super_resolution.cpp		2014-03-24 19:02:16 +04:00
..
fabmap
matching_to_many_images
Qt_sample
rgbdodometry
shape_sample
tutorial_code
3calibration.cpp
baboon.jpg
bagofwords_classification.cpp
bgfg_gmg.cpp
bgfg_segm.cpp
board.jpg
brief_match_test.cpp
build3dmodel.cpp
building.jpg
calibration_artificial.cpp
calibration.cpp
camshiftdemo.cpp
chamfer.cpp
cloning_demo.cpp
cloning_gui.cpp
CMakeLists.txt
connected_components.cpp
contours2.cpp
convexhull.cpp
cout_mat.cpp
create_mask.cpp
dbt_face_detection.cpp
delaunay2.cpp
demhist.cpp
descriptor_extractor_matcher.cpp
detection_based_tracker_sample.cpp
detector_descriptor_evaluation.cpp
detector_descriptor_matcher_evaluation.cpp
dft.cpp
distrans.cpp
drawing.cpp
edge.cpp
em.cpp
fabmap_sample.cpp
facerec_at_t.txt
facerec_demo.cpp
fback.cpp
fern_params.xml
ffilldemo.cpp
filestorage.cpp
fitellipse.cpp
freak_demo.cpp
fruits.jpg
gencolors.cpp
generic_descriptor_match.cpp
grabcut.cpp
houghcircles.cpp
houghlines.cpp
hybridtrackingsample.cpp
image_alignment.cpp
image_sequence.cpp
image.cpp
imagelist_creator.cpp
inpaint.cpp
intelperc_capture.cpp
kalman.cpp
kmeans.cpp
laplace.cpp
latentsvm_multidetect.cpp
left01.jpg
left02.jpg
left03.jpg
left04.jpg
left05.jpg
left06.jpg
left07.jpg
left08.jpg
left09.jpg
left11.jpg
left12.jpg
left13.jpg
left14.jpg
lena.jpg
letter_recog.cpp
letter-recognition.data
linemod.cpp
lkdemo.cpp
logo_in_clutter.png
logo.png
logpolar_bsm.cpp
lsd_lines.cpp
matcher_simple.cpp
matching_to_many_images.cpp
meanshift_segmentation.cpp
memorial.exr
minarea.cpp
morphology2.cpp
npr_demo.cpp
opencv_version.cpp
openni_capture.cpp
pca.cpp
peopledetect.cpp
phase_corr.cpp
pic1.png
pic2.png
pic3.png
pic4.png
pic5.png
pic6.png
points_classifier.cpp
rgbdodometry.cpp
right01.jpg
right02.jpg
right03.jpg
right04.jpg
right05.jpg
right06.jpg
right07.jpg
right08.jpg
right09.jpg
right11.jpg
right12.jpg
right13.jpg
right14.jpg
scenetext01.jpg
scenetext02.jpg
scenetext03.jpg
scenetext04.jpg
scenetext05.jpg
scenetext06.jpg
segment_objects.cpp
select3dobj.cpp
shape_example.cpp
shape_transformation.cpp
simpleflow_demo.cpp
squares.cpp
starter_imagelist.cpp
starter_video.cpp
stereo_calib.cpp
stereo_calib.xml
stereo_match.cpp
stitching_detailed.cpp
stitching.cpp
stuff.jpg
templ.png
textdetection.cpp
train_HOG.cpp
trained_classifier_erGrouping.xml
trained_classifierNM1.xml
trained_classifierNM2.xml
tsukuba_l.png
tsukuba_r.png
tvl1_optical_flow.cpp
ufacedetect.cpp
video_dmtx.cpp
video_homography.cpp
videostab.cpp
watershed.cpp