Vladislav Vinogradov
|
0c7663eb3b
|
Merge branch 'master' into gpu-cuda-rename
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
|
11 years ago |
Roman Donchenko
|
62353b7980
|
Boring changes - samples.
|
11 years ago |
hbristow
|
2059972bf7
|
Preparing to rebase
|
12 years ago |
Andrey Kamaev
|
9944282b09
|
Fix build with STLPort from NDK r8d
|
12 years ago |
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
12 years ago |
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
12 years ago |
Andrey Kamaev
|
f2a02feffa
|
Fix Windows build issues
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
|
12 years ago |
Andrey Kamaev
|
b368f99d03
|
Merged the trunk r8852:8880
|
13 years ago |
Maria Dimashova
|
b3f68d29e7
|
fixed bow sample
|
13 years ago |
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
13 years ago |
Andrey Kamaev
|
c5aba337e9
|
Fixed number of warnings. Fixed mingw64 build.
|
13 years ago |
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
13 years ago |
Andrey Kamaev
|
7b5a45eac4
|
Merged the trunk r8384:8407 (inclusive)
|
13 years ago |
Maria Dimashova
|
608855a322
|
include nonfree for a couple of f2d samples
|
13 years ago |
Vadim Pisarevsky
|
d60623279c
|
switched to non-constant references in Algorithm::addParam, which is more safe.
|
13 years ago |
Vadim Pisarevsky
|
4985c1b632
|
fixed hundreds of warnings from MSVC 2010.
|
13 years ago |
Maria Dimashova
|
6cc3361427
|
fixed #916
|
14 years ago |
itsyplen
|
3876cf22e3
|
reverted samples with new command argument parser. will be continued after OpenCV release.
|
14 years ago |
Kirill Kornyakov
|
07a9d3558e
|
The samples were updated through CommandLineParser class
|
14 years ago |
Vadim Pisarevsky
|
fa2f1c036a
|
removed "#include "windows.h"" from core headers
|
14 years ago |
Anatoly Baksheev
|
8ebff41c29
|
more warnings fixed. +some warnings in examples
|
14 years ago |
Gary Bradski
|
65f7bfbb83
|
revamped
|
14 years ago |
Maria Dimashova
|
dfe4af9e1d
|
fixed warnings under win32
|
14 years ago |
Vadim Pisarevsky
|
1286c1db45
|
fixed multiple warnings from VS2010.
|
14 years ago |
Maria Dimashova
|
7e5c11a920
|
added tests for some detectors; made features2d object create functions as static classes methods; fixed OpponentColorDescriptorExtractor, BriefDescriptorExtractor (on rgb); renamed DynamicDetector
|
14 years ago |
Gary Bradski
|
e9fbbb3396
|
Fleshed out file docs for train and test on PASCAL VOC. This sample need simplification
|
14 years ago |
Maria Dimashova
|
3a873cb051
|
updated some included headers
|
14 years ago |
Maria Dimashova
|
69e329c9fd
|
modified features2d interface; added algorithmic test for DescriptorMatcher; added sample on matching to many images
|
14 years ago |
Alexander Shishkov
|
f0c136c9ab
|
fixed bug with CV_ASSERT
|
14 years ago |
Maria Dimashova
|
9f934363e5
|
added sample on BOW usage to image classification (training and testing is on Pascal VOC dataset)
|
14 years ago |