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
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Andrey Kamaev
5a407153bd
Fix sanity checks in stitching test
2012-12-12 20:29:23 +04:00
Andrey Kamaev
6e244c83cd
Corrected sanity checks in several perf tests
...
Also fixed a typo in performance testing framework and removed hardcoded
temporary file name from highgui perf test
2012-12-12 01:00:47 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
marina.kolpakova
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +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
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +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
971d02cde6
Fix binary compatibility of opencv_stitching
2012-10-17 02:09:26 +04:00
Andrey Kamaev
4a53199e7a
Quiet logs in stitching module
2012-10-09 19:28:15 +04:00
Andrey Kamaev
7cc67701a6
Add sanity checks to stitching perf tests
2012-10-09 19:17:58 +04:00
Alexey Spizhevoy
cb705aad1a
updated DP seaming to support 4 channel images
2012-10-08 14:29:10 +04:00
Vadim Pisarevsky
06a13d9ba0
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
2012-10-02 23:07:46 +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
Vsevolod Glumov
5648e49d59
Merge remote-tracking branch 'origin/master'
2012-08-23 14:58:41 +04:00
Vsevolod Glumov
fc307c87dc
Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.
2012-08-23 14:56:02 +04:00
Andrey Kamaev
1a621c2916
Fix build warnings
2012-08-19 19:36:43 +04:00
Daniil Osokin
f4d4b0d742
disabled perf test on distance transform
2012-08-14 12:13:42 +04:00
Alexey Spizhevoy
27eb5d07cf
Added getScale/setScale for image warpers (stitching module)
2012-08-13 14:39:47 +04:00
Daniil Osokin
45c49a9088
Added perf test
2012-08-10 17:37:48 +04:00
Daniil Osokin
e37b9469da
Added perf tests
2012-08-10 17:17:09 +04:00
marina.kolpakova
634c9dae46
added performance test fot CCL
2012-08-09 12:42:27 +04:00
Andrey Kamaev
0ceb9b6a00
Fixed division by zero case in SphericalProjector::mapForward
2012-08-08 20:57:12 +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
e900952b87
quiet most of the OSX build warnings
2012-07-05 12:56:31 +00:00
Andrey Kamaev
2b6b6f12e2
Debug message is turned off
2012-06-29 08:47:38 +00:00
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +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
47a4e87784
Ignored warnings from gtest with precompiled headers enabled
2012-06-08 14:54:17 +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
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Anatoly Baksheev
0395f7c63f
fixed relative path for stitching/details headers
2012-06-07 13:42:59 +00:00
Andrey Kamaev
cf25f572a6
Documentation: improved correctness checking for superclasses
2012-05-29 14:51:59 +00:00
Andrey Kamaev
dad75658f2
Documentation: added support for multiple superclasses
2012-05-29 14:18:43 +00:00
Andrey Kamaev
6ca618277c
More fixes for documentation.
2012-05-28 20:11:38 +00:00
Andrey Kamaev
78329b0dfe
New bunch of documentation fixes
2012-05-28 14:36:15 +00:00
Andrey Kamaev
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +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
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +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
Andrey Kamaev
ec793df30f
#1205 fixed more bugs/typos in parameters
2012-03-29 08:07:57 +00:00
Alexander Mordvintsev
6848c6d69a
reverted revision 7676 ( #1725 )
2012-03-28 09:44:54 +00:00
Alexander Mordvintsev
13045dec1d
working on python wrappers for stitching
2012-03-28 05:00:41 +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
Ivan Korolev
6e2507c197
Added some new warpers.
2012-03-14 12:59:23 +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
4a299acd48
Added PlanePortraitWarper class.
2012-02-24 13:48:41 +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
Alexey Spizhevoy
d8fa374167
Fixed the multi-band blending test
2012-02-01 10:00:38 +00:00
Alexey Spizhevoy
c09eae4969
Updated the multi-band blending test
2012-01-31 14:36:55 +00:00
Alexey Spizhevoy
7ddb706b29
Added a test for the multi-band blender
2012-01-30 10:31:10 +00:00
Alexey Spizhevoy
ed038ef9dc
Updated the stitching module docs
2012-01-30 07:06:35 +00:00
Alexey Spizhevoy
f5ed96f40c
Updated the stitching module docs
2012-01-30 06:53:50 +00:00
Alexey Spizhevoy
70d137269a
Updated the stitching pipeline image
2012-01-28 15:49:35 +00:00
Alexey Spizhevoy
aba37e54b3
Updated the stitching module docs
2012-01-27 07:40:23 +00:00
Alexey Spizhevoy
9187739d18
Updated the stitching module docs
2012-01-26 13:28:04 +00:00
Alexey Spizhevoy
f0b9c90f79
Updated the stitching module docs
2012-01-26 12:44:32 +00:00
Alexey Spizhevoy
bee271a15c
Updated the stitching module docs
2012-01-26 12:02:45 +00:00
Alexey Spizhevoy
a7e7226a02
Updated the stitching module docs
2012-01-26 11:47:33 +00:00
Andrey Kamaev
ea5d01558c
Updating opencv module definition in cmake (continued)
2012-01-25 13:41:12 +00:00
Andrey Kamaev
9d5c24cdc8
Updating opencv module definition in cmake (continued)
2012-01-25 09:04:49 +00:00
Vladislav Vinogradov
79cc05d062
minor fix
2012-01-25 07:31:56 +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
Alexey Spizhevoy
a9d19b1394
Updated the stitching module docs
2012-01-20 09:07:52 +00:00
Alexey Spizhevoy
0733689583
Updated the stitching module docs
2012-01-20 09:06:53 +00:00
Alexey Spizhevoy
aaace6332f
Updated the stitching module docs
2012-01-19 12:56:03 +00:00
Alexey Spizhevoy
8e8beb070e
Updated the stitching modudle docs
2012-01-19 12:08:09 +00:00
Alexey Spizhevoy
9fa6edf281
Updated the stitching module docs
2012-01-19 09:48:33 +00:00
Alexey Spizhevoy
69b670bdaa
Updated the stitching module docs
2012-01-19 09:43:13 +00:00
Alexey Spizhevoy
2bdd395357
Added the first version of the stitching module docs
2012-01-18 13:43:34 +00:00
Andrey Kamaev
65f5343ed5
Refactored performance tests. TEST_CYCLE macro is renamed to TEST_CYCLE_N; SIMPLE_TEST_CYCLE is renamed to TEST_CYCLE; from now 100 iterations are default for performance tests
2011-12-29 16:46:16 +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
54adb3c9cf
Removed unrequired dependency to the header "cvconfig.h".
2011-12-19 18:31:20 +00:00
Andrey Kamaev
0744092b21
Fixed build with gcc compiler; couple minor improvements in perf testing framework
2011-12-16 04:42:34 +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
Leonid Beynenson
782ccc1844
Made changes in the stitching module to make correct logging on Android.
2011-11-28 20:44:41 +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
Alexey Spizhevoy
0b192cb4ea
Fixed warning in the ORB features finder
2011-10-27 09:00:28 +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
b74e9c101a
Fixed bug in the stitching module (some images appeared at result pano center)
2011-10-24 11:52:36 +00:00
Andrey Kamaev
5656a9dd6b
Better default grid size for ORB-based stitching
2011-10-21 15:38:38 +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
Andrey Kamaev
5d363e67a0
Tegra optimized cvRound; perf test for cvRound; fixed perf test for stitching
2011-09-29 12:11:18 +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
Andrey Kamaev
7ca53cfcd4
Added debug function to project back from pano to original image
2011-09-22 13:58:07 +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
Andrey Pavlenko
94b3bb154e
Perf Tests: default stitching scenario.
2011-09-13 11:19:40 +00:00
Alexey Spizhevoy
f515337beb
Added handling of stitching module into OpenCVConfig.cmake.in
2011-09-08 15:03:35 +00:00
Andrey Pavlenko
6ceb322a47
Fixing Windows build
2011-09-08 08:54:14 +00:00
Andrey Pavlenko
3206945b6d
Fixing Windows build
2011-09-07 12:51:41 +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