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 |
|
Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
2013-04-08 15:47:28 +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 |
|
Ana Huaman
|
f098d98908
|
Added moments_demo.cpp
|
2011-07-13 03:28:23 +00:00 |
|
Ana Huaman
|
bbba2a0608
|
Added pointPolygonTest_demo code for tutorials
|
2011-07-13 02:43:02 +00:00 |
|
Ana Huaman
|
9aa5e5b000
|
Added generalContours_demo2.cpp
|
2011-07-12 21:06:36 +00:00 |
|
Ana Huaman
|
c21b747733
|
Added hull_demo.cpp code for tutorials
|
2011-07-12 20:28:50 +00:00 |
|
Ana Huaman
|
edc1bd4c8c
|
Added generalContours_demo1.cpp tutorial code
|
2011-07-12 19:51:23 +00:00 |
|
Ana Huaman
|
ea8e27961e
|
Added sample code for tutorial findContours_demo.cpp
|
2011-07-12 18:40:51 +00:00 |
|