Roman Donchenko
|
aacf188e83
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp
|
2013-11-19 16:21:09 +04:00 |
|
StevenPuttemans
|
2b106db02f
|
Applied all fixes related to translating C to C++ code
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
|
2013-11-17 20:34:50 +01:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
b131dfeecd
|
Build tutorial codes together with other samples
These codes should be included into regular builds.
|
2012-11-09 10:15:48 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Bernat Gabor
|
bdfc0201de
|
Added the How to create videos with OpenCV Tutorial. Made some corrections to the feature2d, to get rid of some documentation build errors.
|
2011-08-13 14:02:18 +00:00 |
|
Bernat Gabor
|
a0a46b0d70
|
Added a video input tutorial with PSNR and SSIM.
|
2011-08-11 09:34:03 +00:00 |
|
Bernat Gabor
|
a5f38806ab
|
Small modifications to the scan tutorial and added the video-input-psnr-ssim sample file.
|
2011-08-09 05:43:58 +00:00 |
|
Ana Huaman
|
2819438fe6
|
Reorganized code and added Morphology 2 cpp code
|
2011-06-21 05:06:25 +00:00 |
|