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
|
62353b7980
|
Boring changes - samples.
|
2013-09-05 19:02:59 +04:00 |
|
Andrey Kamaev
|
9944282b09
|
Fix build with STLPort from NDK r8d
|
2012-12-22 00:59:56 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Andrey Kamaev
|
f2a02feffa
|
Fix Windows build issues
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
|
2012-08-22 11:21:09 +04:00 |
|
Maria Dimashova
|
b3f68d29e7
|
fixed bow sample
|
2012-07-02 09:21:55 +00:00 |
|
Andrey Kamaev
|
c5aba337e9
|
Fixed number of warnings. Fixed mingw64 build.
|
2012-06-12 14:46:12 +00:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Maria Dimashova
|
608855a322
|
include nonfree for a couple of f2d samples
|
2012-05-21 08:47:57 +00:00 |
|
Vadim Pisarevsky
|
d60623279c
|
switched to non-constant references in Algorithm::addParam, which is more safe.
|
2012-03-17 09:50:47 +00:00 |
|
Vadim Pisarevsky
|
4985c1b632
|
fixed hundreds of warnings from MSVC 2010.
|
2012-03-16 21:21:04 +00:00 |
|
Maria Dimashova
|
6cc3361427
|
fixed #916
|
2011-06-09 17:13:05 +00:00 |
|
itsyplen
|
3876cf22e3
|
reverted samples with new command argument parser. will be continued after OpenCV release.
|
2011-06-09 12:01:47 +00:00 |
|
Kirill Kornyakov
|
07a9d3558e
|
The samples were updated through CommandLineParser class
|
2011-06-03 16:41:41 +00:00 |
|
Vadim Pisarevsky
|
fa2f1c036a
|
removed "#include "windows.h"" from core headers
|
2011-05-13 20:00:58 +00:00 |
|
Anatoly Baksheev
|
8ebff41c29
|
more warnings fixed. +some warnings in examples
|
2011-05-07 12:06:58 +00:00 |
|
Gary Bradski
|
65f7bfbb83
|
revamped
|
2010-12-04 08:24:37 +00:00 |
|
Maria Dimashova
|
dfe4af9e1d
|
fixed warnings under win32
|
2010-11-26 10:35:48 +00:00 |
|
Vadim Pisarevsky
|
1286c1db45
|
fixed multiple warnings from VS2010.
|
2010-11-25 16:55:46 +00:00 |
|
Maria Dimashova
|
7e5c11a920
|
added tests for some detectors; made features2d object create functions as static classes methods; fixed OpponentColorDescriptorExtractor, BriefDescriptorExtractor (on rgb); renamed DynamicDetector
|
2010-11-25 15:59:37 +00:00 |
|
Gary Bradski
|
e9fbbb3396
|
Fleshed out file docs for train and test on PASCAL VOC. This sample need simplification
|
2010-11-24 01:09:50 +00:00 |
|
Maria Dimashova
|
3a873cb051
|
updated some included headers
|
2010-11-16 16:34:27 +00:00 |
|
Maria Dimashova
|
69e329c9fd
|
modified features2d interface; added algorithmic test for DescriptorMatcher; added sample on matching to many images
|
2010-10-29 08:44:42 +00:00 |
|
Alexander Shishkov
|
f0c136c9ab
|
fixed bug with CV_ASSERT
|
2010-10-20 14:02:08 +00:00 |
|
Maria Dimashova
|
9f934363e5
|
added sample on BOW usage to image classification (training and testing is on Pascal VOC dataset)
|
2010-10-08 13:17:34 +00:00 |
|