ee0da48bd2
Feature based stitching's wave correction bugfix.
...
When we have similar matrices in input, then algorithm returns matrices
with NaN values.
2014-09-12 18:07:54 +04:00
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
b595d73d6d
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
2013-08-14 17:16:52 +02:00
2a48f7c035
fixed include for Windows
2013-07-05 09:44:32 +04:00
027065a5a1
removed trailing whitespaces causing warnings
2013-07-04 17:31:12 +04:00
cc85e86ee7
fixed Windows build
2013-07-04 17:22:36 +04:00
438a599288
added 'cmath' include
2013-07-04 16:57:20 +04:00
37ea872204
added handling of camera parameters estimation errors ( #3122 )
2013-07-03 15:20:14 +04:00
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
58fa401b4d
Fixed a bug #2405
2013-06-14 10:43:20 +04:00
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
2ad7b97f1c
All modules (except ocl and gpu) compiles and pass tests
2013-03-22 22:14:26 +04:00
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
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
4a53199e7a
Quiet logs in stitching module
2012-10-09 19:28:15 +04:00
eafb024112
fixed one of the log messages in the stitching module
2012-09-28 14:37:38 +04:00
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
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
b4f17ab79e
Updated motions estimators in the stitching module to be able to set camera intrinsics manually
2011-12-22 09:59:03 +00:00
0b907d088d
Made changes in BundleAdjusterBase class to pass a termination criteria to the Levenberg–Marquardt algorithm.
2011-12-01 13:35:07 +00:00
b8304ce764
Updated stitcher a little bit
2011-10-21 10:47:48 +00:00
c5357cc17c
Added fix for removing too similar images into the stitching module
2011-09-30 12:46:11 +00:00
16f5c67914
Added support of vertical straightening into stitching
2011-09-24 08:20:13 +00:00
afc894db9f
Replaced SVD with eigenval decomposition in waveCorrect func (stitching)
2011-09-23 10:57:20 +00:00
39533a0b1b
Added BA refinement flags into stitching_detailed
2011-09-22 08:58:48 +00:00
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
dbce155874
Refactored motion estimators in stitching module
2011-09-21 12:13:07 +00:00
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
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
95a3ffd0c5
put all old stitching API into detail namespace
2011-09-07 06:34:22 +00:00
fbe2e6fb01
refactored stitching module
2011-09-05 11:52:30 +00:00
9be4701f24
turned opencv_stitching application to module and sample
2011-09-05 10:41:54 +00:00
Dmitry Gribanov
Roman Donchenko
Miroslav Kobetski
Alexey Spizhevoy
Ivan Korolev
Andrey Kamaev
OpenCV Buildbot
Andrey Kamaev