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
|
8f32902ce6
|
Minimize usages of legacy C API inside the library
|
2013-04-16 12:00:02 +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
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
2012-06-15 13:04:17 +00:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Vadim Pisarevsky
|
23768b1826
|
replaced #include <some_opencv_hdr> with #include "some_opencv_hdr" (ticket #719)
|
2011-05-21 18:32:34 +00:00 |
|
Gary Bradski
|
0c6fa4388b
|
revamped
|
2010-12-04 08:30:56 +00:00 |
|
Gary Bradski
|
9ebaaecc85
|
updated docs
|
2010-11-29 07:57:03 +00:00 |
|
Vadim Pisarevsky
|
042271f5f7
|
use the new-style headers in the samples to improve OpenCV build time.
|
2010-11-26 17:59:40 +00:00 |
|
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
2010-05-11 17:44:00 +00:00 |
|