Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Vladislav Vinogradov
0a65f2f4af
merged gpunonfree and nonfree module
2013-03-18 16:14:37 +04:00
Vladislav Vinogradov
fd7bf0b766
moved SURF_GPU and VIBE to gpunonfree module
2013-03-18 14:06:29 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
55698548dd
Avoid assert in lapac.cpp if findHomography fails in BestOf2NearestMatcher::match
2013-03-12 22:49:40 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Vladislav Vinogradov
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
Andrey Kamaev
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
Andrey Kamaev
9944282b09
Fix build with STLPort from NDK r8d
2012-12-22 00:59:56 +04:00
Anatoly Baksheev
94c310fc14
added Ptr::operator==
2012-12-15 22:48:50 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
Andrey Kamaev
afc79e2a02
Fix warnings from MSVC 9 64-bit
2012-10-23 18:20:07 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
marina.kolpakova
e5437e5486
Fix binary compatibility of opencv_gpu
2012-10-17 02:09:40 +04:00
Andrey Kamaev
4a53199e7a
Quiet logs in stitching module
2012-10-09 19:28:15 +04:00
Alexey Spizhevoy
cb705aad1a
updated DP seaming to support 4 channel images
2012-10-08 14:29:10 +04:00
Alexey Spizhevoy
eafb024112
fixed one of the log messages in the stitching module
2012-09-28 14:37:38 +04:00
Alexey Spizhevoy
317a27e9eb
fixed the bug #2385
2012-09-25 16:08:43 +04:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Andrey Kamaev
1a621c2916
Fix build warnings
2012-08-19 19:36:43 +04:00
Alexey Spizhevoy
8c3984c5ff
Refactored the DP based seam finder
2012-08-07 23:55:06 +04:00
alexey.spizhevoy
43d46c0e8b
Minor fix in the DP based seam estimator
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
7222f2724f
Fixed bug
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
85d1c463b9
Minor changes
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
897c2bbd14
Added support of 8UC3
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
a39bce204d
implemented DP-based seam estimation method
2012-08-07 16:24:21 +04:00
Andrey Kamaev
2b6b6f12e2
Debug message is turned off
2012-06-29 08:47:38 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Andrey Kamaev
2f40905548
Fixed Android build
2012-06-08 08:11:17 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vladislav Vinogradov
44eaeee865
refactored gpu BruteForceMather (made it similar to BFMatcher)
2012-04-24 07:56:33 +00:00
Vadim Pisarevsky
5c615ec28f
added optional dependency stitching->nonfree. When nonfree is available, make sure linker does not throw it away.
2012-03-31 17:25:19 +00:00
Alexey Spizhevoy
e87a07e2aa
Fixed bug #1693 . Also corrected default parameters for stitching.
2012-03-19 11:51:18 +00:00
Vadim Pisarevsky
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
Vadim Pisarevsky
957e80abbd
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
2012-03-15 14:36:01 +00:00
Andrey Kamaev
3df41c1d62
Tegra version of cv::detail::
2012-03-12 11:24:27 +00:00
Andrey Kamaev
4ebb66362c
Tegra version of cv::detail::createLaplacePyr
2012-03-11 14:53:13 +00:00
Alexander Shishkov
466345e936
fixed stitching compilation
2012-03-08 08:10:04 +00:00
Andrey Kamaev
49207ce1a0
Minor fix in blender mask conversion.
2012-03-07 20:33:35 +00:00
Andrey Kamaev
679f1dad99
Stitching: added CV_16S weights support to the multiband blender
2012-03-07 14:23:55 +00:00
Leonid Beynenson
9794f5977c
Changed the class OrbFeaturesFinder to make it work with CV_8UC4 and CV_8UC1 images.
2012-02-27 17:46:53 +00:00
Leonid Beynenson
b8eeb019db
Added spherical and cylindrical warpers, which work in the portrait mode -- when poles are located NOT at (0, -1, 0) and (0, 1, 0) points, BUT at (1, 0, 0) and (-1, 0, 0) points.
2012-02-22 15:44:39 +00:00
Vladislav Vinogradov
2d30480982
created wrappers for new NPP functions
...
removed void integral(const GpuMat& src, GpuMat& sum, GpuMat& sqsum, Stream& stream) - it fails with NPP_NOT_IMPLEMENTED error
updated docs, accuracy and performance tests
2012-02-22 10:00:53 +00:00
Anatoly Baksheev
84db4eb6fa
fixed ~200 warnings for windows
...
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
2012-02-14 10:22:34 +00:00
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Leonid Beynenson
2395654cbf
Made changes in the stitching log macros: now the function stitchingLogLevel() may be used to make the stitching classes more/less verbose.
2012-01-24 11:56:32 +00:00
Leonid Beynenson
6d8f4c6b82
Added small debug insertion.
2011-12-26 12:34:28 +00:00
Alexey Spizhevoy
b4f17ab79e
Updated motions estimators in the stitching module to be able to set camera intrinsics manually
2011-12-22 09:59:03 +00:00
Leonid Beynenson
0b907d088d
Made changes in BundleAdjusterBase class to pass a termination criteria to the Levenberg–Marquardt algorithm.
2011-12-01 13:35:07 +00:00
Vladislav Vinogradov
09ba133ddf
prepared GpuMat for moving to core module
2011-10-31 08:51:00 +00:00
Andrey Kamaev
b720eddd9e
Tegra-optimized features matching for Stitching
2011-10-27 14:06:06 +00:00
Andrey Kamaev
f1cb2431b8
Fixed small bugs in Stitcher class
2011-10-25 12:42:08 +00:00
Alexey Spizhevoy
28e006ad4f
Fixed median focal length estimation in the stitching module
2011-10-24 12:35:11 +00:00
Alexey Spizhevoy
b8304ce764
Updated stitcher a little bit
2011-10-21 10:47:48 +00:00
Andrey Kamaev
94f72ae876
Stitching: added grid option to OrbFeaturesFinder
2011-10-21 08:40:10 +00:00
Andrey Kamaev
f299bde3a9
Added ORB features finder into stitching module
2011-10-19 10:48:45 +00:00
Vladislav Vinogradov
d3c4e90760
new optimized implementation of BruteForceMatcher_GPU (~2-3x faster)
2011-10-12 10:23:03 +00:00
Alexey Spizhevoy
9047ef2cdf
Renamed warp of point method into warpPoint
2011-10-07 08:51:01 +00:00
Alexey Spizhevoy
a7fbcad283
Added warp method into the RotationWarper interface, added find() into VoronoiSeamFinder which uses only source image sizes
2011-10-07 08:17:55 +00:00
Alexey Spizhevoy
74561c5b8e
Added createWightMaps function into FeatherBlender (stitching)
2011-10-03 09:44:30 +00:00
Andrey Kamaev
ee413b8026
Avoid duplicated surf extraction step when same parameters are used for detection and descriptors calculation
2011-10-03 08:44:28 +00:00
Alexey Spizhevoy
dce50b67fc
Fixed support of translation in the GPU-based plane warper
2011-10-03 07:42:16 +00:00
Alexey Spizhevoy
607a7fd2c2
Updated GPU warpers interface
2011-10-03 07:10:15 +00:00
Alexey Spizhevoy
404e9cb9d5
Refactored warpers in the stitching module, added buildMaps function into the RotationWarper interface
2011-10-03 06:31:24 +00:00
Alexey Spizhevoy
c5357cc17c
Added fix for removing too similar images into the stitching module
2011-09-30 12:46:11 +00:00
Alexey Spizhevoy
e0bf60fd3e
Minor changes in stitching module
2011-09-27 07:46:28 +00:00
Alexey Spizhevoy
e99b090871
Fixed bug in ROI based features finder (stitching)
2011-09-26 13:17:06 +00:00
Andrey Kamaev
961dc4e348
Fixed build error (Linux)
2011-09-26 11:05:56 +00:00
Alexey Spizhevoy
a7d053f10d
Added handling of ROI in stitching features matchers
2011-09-26 09:59:13 +00:00
Alexey Spizhevoy
b053a3b486
Added matching mask into pairwise matcher from stitching module
2011-09-26 09:24:45 +00:00
Alexey Spizhevoy
551113292b
Refactored stitching module
2011-09-26 08:52:31 +00:00
Alexey Spizhevoy
66b41b67f9
Added support of GPU in stitching seam estimators
2011-09-26 07:57:05 +00:00
Alexey Spizhevoy
16f5c67914
Added support of vertical straightening into stitching
2011-09-24 08:20:13 +00:00
Alexey Spizhevoy
48dec9c03a
Fixed GPU version of multi-band blending in stitching module
2011-09-24 05:58:29 +00:00
Alexey Spizhevoy
afc894db9f
Replaced SVD with eigenval decomposition in waveCorrect func (stitching)
2011-09-23 10:57:20 +00:00
Alexey Spizhevoy
39533a0b1b
Added BA refinement flags into stitching_detailed
2011-09-22 08:58:48 +00:00
Alexey Spizhevoy
4ee462c961
Added selction of BA cost function in stitching samples (and added other BA cost func into stitching module)
2011-09-21 13:22:12 +00:00
Alexey Spizhevoy
dbce155874
Refactored motion estimators in stitching module
2011-09-21 12:13:07 +00:00
Alexey Spizhevoy
4a5abc7552
Added translation parameter into stitching module warpers. For now only PlaneWarper and PlaneWarperGpu warpers support it.
2011-09-21 10:53:23 +00:00
Alexey Spizhevoy
07efb17d12
Fixed warper selection bug in stitching_detailed. Removed estimation of aspect ratio in BA in stitching to avoid stretching of input images. Did minor refactoring.
2011-09-19 06:22:40 +00:00
Alexey Spizhevoy
23636433d7
Updated bundle adjustment in stitching module: 1) it minimizes reprojection error now, 2) it minimizes error over focal, aspect, p.p.x, p.p.y parameters. Refactored and updated warpers.
2011-09-16 12:25:23 +00:00
Alexey Spizhevoy
a72da12c80
Added fix for 0 found features in stitching matcher
2011-09-13 14:15:18 +00:00
Alexey Spizhevoy
cbb6ac0c34
refactored features finders in stitching module
2011-09-07 12:48:48 +00:00
Alexey Spizhevoy
c9a41c6802
added first version of public stitching API, added simple sample which uses that API, old sample renamed to stitching_detailed
2011-09-07 11:14:27 +00:00
Andrey Kamaev
52184c8803
Gpu functionality in stitching module is excluded from Android build
2011-09-07 08:59:39 +00:00
Alexey Spizhevoy
95a3ffd0c5
put all old stitching API into detail namespace
2011-09-07 06:34:22 +00:00
Vladislav Vinogradov
bf0081a850
fixed bug in stitching in GpuSurfFeaturesFinder (missing upright parameter)
2011-09-07 06:19:21 +00:00
Alexey Spizhevoy
fbe2e6fb01
refactored stitching module
2011-09-05 11:52:30 +00:00
Alexey Spizhevoy
9be4701f24
turned opencv_stitching application to module and sample
2011-09-05 10:41:54 +00:00