Roman Donchenko
|
464a010f53
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
|
2013-12-10 12:51:00 +04:00 |
|
Baichuan Su
|
632b21e090
|
Modify default setting, using ocl method when have ocl module
|
2013-12-04 18:26:54 +04:00 |
|
Baichuan Su
|
2cf16db683
|
Add Macro to decide using ocl method or not.
|
2013-12-04 18:26:54 +04:00 |
|
Baichuan Su
|
00300baa53
|
Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.
|
2013-12-04 18:26:54 +04:00 |
|
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
|
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
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Maria Dimashova
|
3dfa917879
|
refactored train and predict methods of em
|
2012-04-17 06:29:40 +00:00 |
|
Maria Dimashova
|
7120355e06
|
updated points_classifier sample to use bayes classifier after distributions estimation by EM
|
2012-04-16 14:54:56 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +00:00 |
|
Maria Dimashova
|
85fa0e7763
|
added cv::EM, moved CvEM to legacy, added/updated tests
|
2012-04-06 09:26:11 +00:00 |
|
Vadim Pisarevsky
|
4985c1b632
|
fixed hundreds of warnings from MSVC 2010.
|
2012-03-16 21:21:04 +00:00 |
|
Maria Dimashova
|
f8d93df52a
|
minor
|
2011-05-11 09:18:28 +00:00 |
|
P. Druzhkov
|
15f7918e34
|
problem with the supported data matrices types is fixed
minor fixes in CvGBTrees, its test and sample
|
2011-05-11 07:58:47 +00:00 |
|
Anatoly Baksheev
|
8ebff41c29
|
more warnings fixed. +some warnings in examples
|
2011-05-07 12:06:58 +00:00 |
|
Maria Dimashova
|
1b5f5dd371
|
changed GBT parameters in sample
|
2011-05-04 14:49:02 +00:00 |
|
Maria Dimashova
|
098795cd16
|
minor changes
|
2011-05-01 09:01:57 +00:00 |
|
Maria Dimashova
|
92852ca06e
|
added new ML models to points_classifier sample
|
2011-04-30 18:04:33 +00:00 |
|
Maria Dimashova
|
428aef522b
|
added new sample on ML models
|
2011-04-30 16:44:34 +00:00 |
|