opencv/samples/c
Roman Donchenko f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
..
example_cmake Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
adaptiveskindetector.cpp Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
agaricus-lepiota.data
airplane.jpg
baboon200_rotated.jpg
baboon200.jpg
baboon.jpg
bgfg_codebook.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
blobtrack_sample.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
box_in_scene.png
box.png
build_all.sh Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
calonder_params.xml
cat.jpg
cat.xml
CMakeLists.txt Rename sample & tutorial executables 2012-11-09 10:15:48 +04:00
contours.c Fixed build with MSVC 2012-06-20 16:03:03 +00:00
convert_cascade.c Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
cvsample.dsp
cvsample.vs2005.vcproj
delaunay.c Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
facedetect.cmd Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
facedetect.cpp Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
fback_c.c Move C API of opencv_video to separate file 2013-04-11 17:38:33 +04:00
find_obj_calonder.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
find_obj_ferns.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
find_obj.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
fruits.jpg
intrinsics.yml
JCB.png datamatrix 2011-04-25 21:51:36 +00:00
latentsvmdetect.cpp Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
lena.jpg
morphology.c Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
motempl.c Move C API of opencv_video to separate file 2013-04-11 17:38:33 +04:00
mser_sample.cpp Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
mushroom.cpp Fixed mismatching allocation and deallocation: el_ptr 2013-08-14 23:36:29 +10:00
one_way_sample.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
one_way_train_0000.jpg
one_way_train_0001.jpg
one_way_train_images.txt
polar_transforms.c Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
puzzle.png
pyramid_segmentation.c Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
scene_l.bmp
scene_r.bmp
smiledetect.cpp Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
stuff.jpg
tree_engine.cpp Move cv::Mat out of core.hpp 2013-04-01 15:24:34 +04:00
tree.avi
waveform.data