Vladislav Vinogradov 1036ce807c Merge branch 'master' into gpu-cuda-rename ...

Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudaimgproc/src/gftt.cpp
	modules/objdetect/include/opencv2/objdetect/erfilter.hpp
	modules/objdetect/src/erfilter.cpp
	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

2013-09-09 12:57:35 +04:00

..

fabmap

added openfabmap code, contributed by Arren Glover. fixed several warnings in the new versions of retina filters

2012-09-03 17:03:31 +04:00

matching_to_many_images

Normalize whitespace in documentation and text files

2012-10-17 21:42:09 +04:00

Qt_sample

fixed compilation errors

2013-04-17 15:24:53 +04:00

rgbdodometry

initial version of rgbd odometry with sample

2012-03-11 09:31:28 +00:00

tutorial_code

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

3calibration.cpp

Move C API of opencv_calib3d to separate file

2013-04-11 21:00:17 +04:00

baboon.jpg

added missing images for C++ samples

2010-11-30 10:09:08 +00:00

bagofwords_classification.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

bgfg_gmg.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

bgfg_segm.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

board.jpg

added houghcircles sample, improved circle detection (ticket #951)

2012-03-27 12:00:22 +00:00

brief_match_test.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

build3dmodel.cpp

Move C API of opencv_calib3d to separate file

2013-04-11 21:00:17 +04:00

building.jpg

propagated some more fixes from 2.3 branch to the trunk

2011-06-30 12:06:26 +00:00

calibration_artificial.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

calibration.cpp

Move C API of opencv_calib3d to separate file

2013-04-11 21:00:17 +04:00

camshiftdemo.cpp

Move C API of opencv_video to separate file

2013-04-11 17:38:33 +04:00

chamfer.cpp

Make imgproc.hpp independent from C API

2013-04-08 15:47:28 +04:00

CMakeLists.txt

renamed gpuoptflow -> cudaoptflow

2013-09-02 14:00:43 +04:00

connected_components.cpp

Move non-CV functionality from core.hpp to separate utility.hpp header

2013-03-20 17:56:06 +04:00

contours2.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

convexhull.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

cout_mat.cpp

Rewrite Mat formatting without std streams

2013-04-03 11:55:19 +04:00

dbt_face_detection.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

delaunay2.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

demhist.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

descriptor_extractor_matcher.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

detection_based_tracker_sample.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

detector_descriptor_evaluation.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

detector_descriptor_matcher_evaluation.cpp

Move non-CV functionality from core.hpp to separate utility.hpp header

2013-03-20 17:56:06 +04:00

dft.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

distrans.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

drawing.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

edge.cpp

Make imgproc.hpp independent from C API

2013-04-08 15:47:28 +04:00

em.cpp

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00

erfilter.cpp

changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.

2013-09-06 19:10:53 +02:00

fabmap_sample.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

facerec_at_t.txt

Documentation for FaceRecognizer started (not added to toc of contrib/doc/contrib.rst yet). CSV file for the samples/cpp/facerec_demo.cpp added. Added some more exceptions to warn the user, when passing bad aligned data.

2012-06-12 22:49:14 +00:00

facerec_demo.cpp

Move legacy part of opencv_contrib to separate header

2013-04-12 19:37:40 +04:00

fback.cpp

Move C API of opencv_video to separate file

2013-04-11 17:38:33 +04:00

fern_params.xml

Moved fern_params.xml to samples/cpp for generic_descriptor_match sample

2010-06-11 09:46:43 +00:00

ffilldemo.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

filestorage.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

fitellipse.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

freak_demo.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

fruits.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

gencolors.cpp

fixed compilation under MSVC

2011-10-06 12:37:53 +00:00

generic_descriptor_match.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

grabcut.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

houghcircles.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

houghlines.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

hybridtrackingsample.cpp

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00

image_alignment.cpp

Move C API of opencv_video to separate file

2013-04-11 17:38:33 +04:00

image_sequence.cpp

War on Whitespace, master edition: tabs.

2013-08-27 17:13:53 +04:00

image.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

imagelist_creator.cpp

Set stricter warning rules for gcc

2012-06-07 17:21:29 +00:00

inpaint.cpp

Make photo.hpp independent from C API

2013-04-08 15:47:29 +04:00

kalman.cpp

Fixed typo

2013-04-21 23:04:54 +04:00

kmeans.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

laplace.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

latentsvm_multidetect.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-07-03 19:53:21 +04:00

left01.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left02.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left03.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left04.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left05.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left06.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left07.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left08.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left09.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left11.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left12.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left13.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

left14.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

lena.jpg

added missing images for C++ samples

2010-11-30 10:09:08 +00:00

letter_recog.cpp

Move C++ basic structures to separate header and inverse dependency from C API

2013-04-01 15:24:32 +04:00

letter-recognition.data

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

linemod.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

lkdemo.cpp

Merge branch '2.4'

2013-04-12 15:35:38 +04:00

logo_in_clutter.png

added chamfer matcher code and sample (contributed by Antonella Cascitelli, Marco Di Stefano and Stefano Fabri)

2010-11-30 01:34:39 +00:00

logo.png

added chamfer matcher code and sample (contributed by Antonella Cascitelli, Marco Di Stefano and Stefano Fabri)

2010-11-30 01:34:39 +00:00

logpolar_bsm.cpp

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00

lsd_lines.cpp

The accurate LineSegmentDetector object.

2013-07-22 15:08:23 +03:00

matcher_simple.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

matching_to_many_images.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

meanshift_segmentation.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

memorial.exr

added openexr sample file

2011-08-15 13:18:01 +00:00

minarea.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

morphology2.cpp

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00

opencv_version.cpp

Normalized file endings.

2013-08-21 18:59:25 +04:00

OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

openni_capture.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

pca.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

peopledetect.cpp

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

phase_corr.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

pic1.png

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

pic2.png

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

pic3.png

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

pic4.png

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

pic5.png

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

pic6.png

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

points_classifier.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

retinaDemo.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

rgbdodometry.cpp

Make imgproc.hpp independent from C API

2013-04-08 15:47:28 +04:00

right01.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right02.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right03.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right04.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right05.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right06.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right07.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right08.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right09.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right11.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right12.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right13.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

right14.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

scenetext_GT.png

Class-specific Extremal Region Filter algorithm as proposed in :

2013-07-20 01:10:05 +02:00

scenetext.jpg

Class-specific Extremal Region Filter algorithm as proposed in :

2013-07-20 01:10:05 +02:00

segment_objects.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

select3dobj.cpp

Move C API of opencv_calib3d to separate file

2013-04-11 21:00:17 +04:00

simpleflow_demo.cpp

Move non-CV functionality from core.hpp to separate utility.hpp header

2013-03-20 17:56:06 +04:00

squares.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

starter_imagelist.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

starter_video.cpp

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

stereo_calib.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

stereo_calib.xml

rewrote stereo_calib in C++

2010-11-29 13:31:52 +00:00

stereo_match.cpp

Move legacy part of opencv_contrib to separate header

2013-04-12 19:37:40 +04:00

stitching_detailed.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

stitching.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

stuff.jpg

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

templ.png

added Generalized Hough implementation

2012-09-10 16:49:40 +04:00

trained_classifierNM1.xml

better classifiers performance by training them with a new dataset of "manually" selected regions

2013-09-06 12:31:49 +02:00

trained_classifierNM2.xml

better classifiers performance by training them with a new dataset of "manually" selected regions

2013-09-06 12:31:49 +02:00

tsukuba_l.png

propagated some more fixes from 2.3 branch to the trunk

2011-06-30 12:06:26 +00:00

tsukuba_r.png

propagated some more fixes from 2.3 branch to the trunk

2011-06-30 12:06:26 +00:00

tvl1_optical_flow.cpp

Move non-CV functionality from core.hpp to separate utility.hpp header

2013-03-20 17:56:06 +04:00

video_dmtx.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

video_homography.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

videostab.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

watershed.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00