Olexa Bilaniuk
87c2b8197a
Bug fixes in mask output.
...
Previously, the output mask of inliers could remain completely
uninitialized. This fix is the first part of a solution.
2015-02-05 02:18:41 -05:00
Olexa Bilaniuk
b90800f0c7
Corrected typo in comment.
...
The inverted JtJ does not multiply itself, but rather Jte. Correct this
in the comment.
2015-02-04 12:12:14 -05:00
Olexa Bilaniuk
2609e77af7
Silence spurious loss-of-data warnings from Windows.
...
Added explicit casts to silence warnings in fundam.cpp and rhorefc.cpp.
2015-02-04 02:26:01 -05:00
Olexa Bilaniuk
ce0570b777
Splitting vectorized code into separate branch.
...
Deleted SSE code from master branch.
Slight cleanups in fundam.cpp were made as a consequence.
2015-02-03 23:33:52 -05:00
Olexa Bilaniuk
69b146412a
Edited Doxygen documentation in the module calib3d.
...
Added a mention within calib3d.hpp that the flag RHO is available as an
option on calls to findHomography().
2015-02-03 22:55:40 -05:00
Olexa Bilaniuk
8907e6feac
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
2015-02-03 22:50:45 -05:00
Vadim Pisarevsky
bd4580a242
Merge pull request #3589 from JBosch:master
2015-01-21 10:46:53 +00:00
Olexa Bilaniuk
045f8294bb
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
2015-01-20 13:11:09 -05:00
Olexa Bilaniuk
02124f19e6
Further LevMarq improvements.
...
Implemented a damping-parameter choice strategy similar to that
described in http://www2.imm.dtu.dk/documents/ftp/tr99/tr05_99.pdf .
Removed a few debug statements.
Chosen a new starting lambda value, 0.01.
We now actually output the mask of inliers.
2015-01-15 04:21:16 -05:00
Olexa Bilaniuk
ff91af825d
LevMarq made semi-functional.
...
Replaced the complex rules OpenCV uses to select lambda with a naive but
fast heuristic. It's imperfect but produces good results. It is still
subject to the same problem as OpenCV - namely, on occasion LevMarq will
make a poor result even worse.
2015-01-14 04:22:48 -05:00
Vijay Pradeep
1292fdf71a
Now using default arg instead of overloads
2015-01-13 11:25:01 -08:00
Olexa Bilaniuk
4401095b38
Optimizations to Jacobian and error calculations.
...
Deleted multiplications by zero and consequent additions of zero terms.
2015-01-12 11:33:05 -05:00
Olexa Bilaniuk
7fca146b21
More LevMarq bugfixes.
...
LevMarq now doesn't outright fail, but doesn't seem to improve things
much if at all.
2015-01-12 05:37:40 -05:00
Olexa Bilaniuk
33a3fba2d1
Work on LevMarq code.
...
Refactoring of Cholesky decomposition.
Fix for memory corruption bug.
LevMarq as a whole still non-functional.
2015-01-12 04:58:07 -05:00
Olexa Bilaniuk
c175a86cbb
Merge remote-tracking branch 'upstream/master' into rho
2015-01-12 02:11:14 -05:00
Timur Sattarov
4762728fd5
More sensible error messages
2015-01-11 03:56:07 +04:00
Vijay Pradeep
964d5a20e9
Whitespace fix
2015-01-09 10:44:19 -08:00
Vijay Pradeep
177478a8ad
overload instead of default arg for ABI backwards compatibility. rng_seed is now 'int' to support python port
2015-01-09 10:18:08 -08:00
Josep Bosch
75c99d65a5
Fisheye calibration methods available now in python
2015-01-09 10:05:36 +01:00
Vijay Pradeep
a1c5740044
solvePnPRansac now accepts a seed and is deterministic
2015-01-08 18:24:55 -08:00
Vijay Pradeep
042ff210d5
Fixing race condition by expanding resultsMutex lock section
2015-01-08 15:26:15 -08:00
Vadim Pisarevsky
1c8493fb0d
Merge pull request #3549 from mshabunin:sphinx-doc-remove
2014-12-31 09:14:22 +00:00
Olexa Bilaniuk
46631c4b18
Merge remote-tracking branch 'upstream/master' into rho
2014-12-29 20:55:24 -05:00
Julien Nabet
2d5e3b57ea
Fix cppcheck reports warnings:
...
(performance) Possible inefficient checking for 'lmap' emptiness
(warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
(style) Array index '<xxx>' is used before limits check
2014-12-27 10:54:34 +01:00
Maksim Shabunin
d01bedbc61
Removed Sphinx documentation files
2014-12-26 19:12:19 +03:00
Maksim Shabunin
c485aee464
Included c-headers for better 2.4 compatibility
2014-12-19 17:05:26 +03:00
Maksim Shabunin
91e21847e2
Some changes to make migration to 3.0 easier
2014-12-16 13:00:31 +03:00
Olexa Bilaniuk
bcc630a8dc
Merge remote-tracking branch 'upstream/master' into rho
2014-12-15 12:31:22 -05:00
Dmitry-Me
f269828160
Reduce variables scope, move declaration to first use point
2014-12-08 18:21:17 +03:00
Olexa Bilaniuk
51963f95dd
Merge remote-tracking branch 'upstream/master' into rho
2014-12-05 15:56:33 -05:00
Dmitry-Me
cb049657e5
Prevent division by zero
2014-12-02 14:44:09 +03:00
Maksim Shabunin
03e213ccae
Doxygen documentation: BiB references and fixes
2014-12-01 15:50:55 +03:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
c5a698fb54
Doxygen documentation: calib3d and features2d modules
2014-12-01 15:47:13 +03:00
Olexa Bilaniuk
68e59d6154
[RHO] Initial commit of RHO algorithm for rapid homography estimation.
...
Implements the RHO algorithm as presented in
Paper: Bilaniuk, Olexa, Hamid Bazargani, and Robert Laganiere. "Fast
Target Recognition on Mobile Devices: Revisiting Gaussian Elimination
for the Estimation of Planar Homographies." In Computer Vision and
Pattern Recognition Workshops (CVPRW), 2014 IEEE Conference on, pp.
119-125. IEEE, 2014.
- Complete, heavily documented reference C implementation, as well as
temporarily disabled dirty SSE2 port.
- Enabled tests for RHO in test_homography; Currently these fail
presumably due to too-stringent accuracy requirements.
- Refinement and final refinement are not yet functional; Do not pass
their corresponding flags to RHO.
2014-11-17 15:06:08 -05:00
Alexander Duda
60cacbfd66
solvePnPRansac: fix mask generation
2014-11-09 23:10:43 +01:00
Alexander Duda
ed55d13112
PnPRansacCallback::computeError: fix count in case of Nx3 matrices
2014-11-09 23:08:47 +01:00
Pat O'Keefe
83ccdabe7e
Add test for calib3d function decomposeProjectionMatrix(...)
2014-10-25 19:11:02 -06:00
vbystricky
21ad8e92d4
Optimize OpenCL version of StereoBM function
...
Fix problems on NVidia devices.
2014-10-23 20:18:53 +04:00
Vadim Pisarevsky
d2b9dc5530
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
2014-10-18 20:44:26 +04:00
Vadim Pisarevsky
4038beb67e
fixed incorrect array access in solvepnp (which affected debug builds only)
2014-10-17 17:01:39 +04:00
Vadim Pisarevsky
1a809ca89b
fixed msvc compile warning
2014-10-17 15:56:27 +04:00
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
Alexander Alekhin
af1d29db83
Merge pull request #3332 from lupustr3:pvlasov/implementation_detector
2014-10-16 14:51:53 +00:00
Vadim Pisarevsky
b30ad42609
Merge pull request #3270 from boaz001:patch-1
2014-10-16 10:09:28 +00:00
Boaz Stolk
ae81006eab
Applied proposed fix
2014-10-15 22:36:38 +02:00
Pavel Vlasov
45958eaabc
Implementation detector and selector for IPP and OpenCL;
...
IPP can be switched on and off on runtime;
Optional implementation collector was added (switched off by default in CMake). Gathers data of implementation used in functions and report this info through performance TS;
TS modifications for implementations control;
2014-10-15 14:24:41 +04:00
Vadim Pisarevsky
3b250d6e9c
this is trivial change; the main change is in opencv_extra - added regression data for perf tests
2014-10-11 22:57:22 +04:00
edgarriba
4071c4e7c9
Updating to c++ interfaces
2014-10-11 01:44:46 +02:00
edgarriba
88aed15ffa
Removing windows compilation crashes
2014-10-07 09:10:03 +02:00
edgarriba
f317d1277f
Merge remote-tracking branch 'upstream/master'
2014-10-06 23:46:30 +02:00
edgarriba
2494e028c0
Updating upnp sanity heck
2014-10-06 18:18:03 +02:00
edgarriba
1709421c2c
Updating sanity check
2014-10-06 17:43:01 +02:00
edgarriba
71dd9a6f1b
Updating sanity check
2014-10-06 17:22:43 +02:00
edgarriba
862b675bee
Updating sanity check
2014-10-06 16:23:21 +02:00
edgarriba
f328f9a10d
Removing whitespaces
2014-10-06 14:53:06 +02:00
edgarriba
72fb85f6a0
Removing whitespaces
2014-10-06 13:01:23 +02:00
edgarriba
4d54f35a96
Updating documentation
2014-10-06 10:31:50 +02:00
edgarriba
d6bf209bb3
Updating for N=2
2014-10-06 10:28:04 +02:00
edgarriba
dc76ca5fc9
Updating documentation
2014-10-02 21:39:29 +02:00
edgarriba
7520544840
Return the estimated focal length
2014-10-02 17:05:42 +02:00
edgarriba
ea893bf9d9
Updating UPNP documentation
2014-10-02 17:05:06 +02:00
edgarriba
7429454171
Add UPNP acc_test and perf_test
2014-10-02 16:45:59 +02:00
edgarriba
a5b3a205d9
Add UPNP case + Modify model_points
2014-10-02 16:45:04 +02:00
edgarriba
84475ef1de
UPNP code for N=1
2014-10-02 16:43:50 +02:00
edgarriba
71f4894d87
Added UPNP flag
2014-10-02 16:43:15 +02:00
Alexander Smorkalov
71c4e96e17
Test fisheye.rectify disabled for Tegra.
2014-09-30 14:49:33 +04:00
Vadim Pisarevsky
e5ab0ac294
Merge pull request #3201 from PhilLab:patch-3
2014-09-14 18:49:35 +00:00
Philipp Hasper
62c704d1e9
Updated PnP parameter documentation
2014-09-09 12:24:05 +02:00
Philipp Hasper
cc7aa5890d
Fixing documentation links
2014-09-08 14:41:29 +02:00
PhilLab
e95c33dd18
PnP solver: fixed element-wise access
2014-08-25 17:06:17 +02:00
Vadim Pisarevsky
887a950243
Merge pull request #3116 from shubhra:master
2014-08-22 07:15:40 +00:00
Vadim Pisarevsky
5afaa6b1e7
Merge pull request #3129 from PhilLab:patch-2
2014-08-21 05:30:17 +00:00
Shubhra Pandit
7b2a1d15cc
Doc changes for feature changes 1544 and 1557
2014-08-20 20:49:50 -04:00
PhilLab
e09adc4fde
Clarified parameter useExtrinsicGuess in solvePnP
2014-08-19 11:08:16 +02:00
edgarriba
deec233519
cleaned dls code
2014-08-19 00:56:13 +02:00
edgarriba
15704c384e
cleaned dls code
2014-08-19 00:52:09 +02:00
edgarriba
2653d745fd
updated sanity data
2014-08-19 00:35:22 +02:00
edgarriba
6ea73a5bff
updated dls perf test
2014-08-19 00:22:08 +02:00
edgarriba
7e2bb63378
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-18 22:30:00 +02:00
edgarriba
620387fbe1
Update perf_pnp && ransac model points
2014-08-18 21:46:16 +02:00
Shubhra Pandit
6ca893be23
Adding feature 1544 and 1557
...
-cv::findHomography added a parameter for RANSAC iterations
-cv::findHomography added a parameter for RANSAC confidence
2014-08-17 13:06:06 -04:00
Vadim Pisarevsky
af2434c547
Merge pull request #2827 from Alexander-Petrikov-ELVEES-NEOTEK:neon-stereobm
2014-08-13 13:04:02 +00:00
Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
2014-08-13 15:21:35 +04:00
edgarriba
3c3d695d4d
Perf test update
2014-08-12 18:29:43 +02:00
edgarriba
12f8d8069d
removed old code
2014-08-12 16:49:19 +02:00
edgarriba
1dec1645e5
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-12 16:45:22 +02:00
edgarriba
de2861e7a9
DLS performance modifications
2014-08-12 16:20:22 +02:00
edgarriba
d1f4f6f4b8
DLS performance modifications
2014-08-12 16:15:19 +02:00
edgarriba
dccc10ff12
DLS perf
2014-08-11 17:53:43 +02:00
edgarriba
2666da892f
DLS perf update
2014-08-11 17:09:26 +02:00
edgarriba
cc81b4a5cd
SOLVEPNP_* flags whitespace
2014-08-11 16:31:28 +02:00
edgarriba
afdb67b462
SOLVEPNP_* flags
2014-08-11 16:28:09 +02:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
edgarriba
90b3086f4a
RANSAC test confidence 0.99
2014-08-11 12:31:10 +02:00
edgarriba
6c8b11afee
DLS test
2014-08-11 11:31:18 +02:00
edgarriba
d7f0b9de25
DLS test
2014-08-11 11:02:00 +02:00
edgarriba
c7f6c0cb9f
Fixed warnings + RANSAC confidence to double
2014-08-11 10:17:42 +02:00
edgarriba
213241c06a
DLS test update
2014-08-11 09:44:24 +02:00
edgarriba
2d26f60192
test dls
2014-08-09 21:54:22 +02:00
edgarriba
3780de9d98
test for DLS
2014-08-09 21:26:38 +02:00
edgarriba
67eb6dde75
warning removed
2014-08-09 20:55:18 +02:00
edgarriba
f8c5acee4c
modified number test points
2014-08-08 15:20:38 +02:00
edgarriba
8b732e086d
updated ransanc model
2014-08-08 13:52:15 +02:00
edgarriba
e5a91a8be8
Modification Ransac model points
2014-08-07 14:59:01 +02:00
edgarriba
3a2cf37115
fixed conflicts
2014-08-07 12:41:47 +02:00
Vadim Pisarevsky
0428ce4703
Merge pull request #3037 from PhilLab:pnpPatch
2014-08-06 20:21:05 +00:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
edgarriba
7b0be9cf8f
Update code
2014-08-05 17:27:20 +02:00
edgarriba
0d2bc9b0a1
Removed whitespaces
2014-08-05 17:02:06 +02:00
edgarriba
a3e74ec521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
2014-08-05 12:59:47 +02:00
unknown
3fe4980ce1
Double precision for solvePnPRansac()
2014-08-04 14:20:32 +02:00
Roman Donchenko
74e58ddbb1
Disable the broken fisheye undistortImage test
2014-08-01 19:50:17 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
edgarriba
3e2a57ff35
Update for non Eigen users
2014-08-01 10:48:39 +02:00
Samson Yilma
4fe04775d1
Merge remote-tracking branch 'upstream/master' into HomographyDecomp
2014-07-30 20:36:41 -04:00
Samson Yilma
3b608fa489
added comment.
2014-07-30 19:32:37 -04:00
Samson Yilma
3c5eb7de84
updated documentation for decomposeHomography
2014-07-30 18:53:33 -04:00
edgarriba
b6b0c2aa8e
MACRO for EIGEN libraries
2014-07-30 11:22:25 +02:00
edgarriba
4ddc6a4a77
Update for DLS test
2014-07-28 12:03:02 +02:00
edgarriba
0427b70a2f
Filtering solutions with imaginary part
2014-07-28 12:01:39 +02:00
edgarriba
5f35bed5c5
Delete Debug functions
2014-07-25 11:54:41 +02:00
edgarriba
9cad1dfa0d
Update C headers for DLS
2014-07-25 11:49:20 +02:00
edgarriba
5980613317
Update
2014-07-25 11:46:28 +02:00
edgarriba
5f54a22d29
Update documentation for DLS
2014-07-25 11:39:06 +02:00
edgarriba
a4e21c8fa8
Update DLS test
2014-07-25 11:29:34 +02:00
edgarriba
a3f065c409
DLS working
2014-07-25 11:01:47 +02:00
edgarriba
48c4a79d2e
DLS full algorithm compiling
2014-07-23 17:26:03 +02:00
edgarriba
730fe9e582
Hessian+ cayley2rotbar
2014-07-22 17:56:25 +02:00
edgarriba
b1b9a29e48
Extracting Eigenvalues and Eigenvectors
2014-07-21 17:45:54 +02:00
edgarriba
40f6d320c2
last update
2014-07-21 09:31:45 +02:00
Vadim Pisarevsky
d7bbafd683
Merge pull request #2948 from PhilLab:patch-1
2014-07-18 10:10:44 +00:00
Vadim Pisarevsky
39020fc9cf
Merge pull request #2898 from PhilLab:2.4
2014-07-18 09:26:50 +00:00
edgarriba
42ab7fd876
dls() no compiles
2014-07-16 00:06:29 +02:00
edgarriba
fb67ab1257
Initial DLS add
2014-07-15 09:58:49 +02:00
Vadim Pisarevsky
8d58b238ca
Merge pull request #2780 from hbadino:Feature_3692_2.4
2014-07-14 19:00:52 +00:00
edgarriba
9abcd88435
Upate test ransac
2014-07-09 17:39:32 +02:00
edgarriba
a5d40d7674
Test Run OK
2014-07-09 17:27:08 +02:00
unknown
52c05e75cc
Fixed C++11 compatibility warning
2014-07-09 14:19:15 +02:00
edgarriba
89246e1a45
Update Ransac documentation
2014-07-09 10:59:00 +02:00
edgarriba
ba5a8ee299
Solvepnpransac() returns boolean
2014-07-09 10:37:37 +02:00
edgarriba
ce07024a44
Updated solvePnPRansac()
2014-07-08 17:09:55 +02:00
edgarriba
b74cfe8c2c
nothing
2014-07-08 16:26:56 +02:00
edgarriba
ac8cce3963
solvepnpransac() confidence added
2014-07-08 16:23:25 +02:00
edgarriba
747c6a2bd2
solvepnpransac() interface changed
2014-07-08 16:07:30 +02:00
PhilLab
2c29ee9e00
Added cast and removed formatting error
2014-07-08 13:24:35 +02:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
PhilLab
aafda43df1
Double precision for solvePnPRansac()
...
solvePnPRansac() and pnpTask() now accept object or image points with double precision.
2014-07-08 11:52:42 +02:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
edgarriba
dd52d1b526
New Ransac implementation WORKING
2014-07-04 17:20:17 +02:00
edgarriba
e0c4936c99
Input/Output Arrays (DOES NOT COMPILE)
2014-07-03 12:23:03 +02:00
edgarriba
6eb1426ea2
First version Ransac (DOESN'T COMPILE)
2014-07-02 14:53:12 +02:00
Ilya Lavrenov
43e4946cca
fix for fisheye
2014-07-02 11:53:53 +04:00
unknown
ade46bd428
Fixed typos in comments
2014-06-26 16:29:45 +02:00
Ilya Krylov
84bb77e914
Fixed android and windows x64 build issues
2014-06-23 17:06:40 +04:00
Alexander Petrikov
6882970248
Add CV_Assert (ndisp % 8 == 0) to NEON version
2014-06-23 11:08:51 +04:00
Daniel Angelov
660d7cd3ae
Updated findHomography docs branch 2.4
...
Updated the documents to give warning to the users of `findHomography` that the function may return an empty matrix in some cases.
The user must take care of checking that.
2014-06-16 13:05:17 +01:00
Daniel Angelov
54292a8376
Removed "CV_" prefix from constants in docs
...
The `calib3d.hpp` has a definition of the constant that does not contain the prefix "CV_".
The affected methods were `findHomography` and `findEssentialMat`.
Now the documentation updates the definition of the constants to conform to the header.
2014-06-14 18:41:04 +01:00
Vadim Pisarevsky
2b2ce3f6e9
Merge pull request #2726 from Ilya-Krylov:2.4
2014-06-12 21:37:47 +04:00
Aleksandr Petrikov
1a1cd9b4e9
add NEON realization for StereoBM(findCorrespondence, prefilterXSobel)
2014-06-04 12:06:33 +04:00
Daniel Angelov
ce1b6e2137
Fixed inconsistency with flag names
...
Fixed inconsistency with flag names for solvePnP.
The default value for the function lacks the CV_ prefix. The code checks against "ITERATIVE". The suggested values for the parameters *include* the prefix.
Even though the enum CV_ITERATIVE (+ CV_P3P, CV_EPNP) = ITERATIVE (& P3P, EPNP), lets show to the users only one of them.
Now the user sees only {ITERATIVE, P3P, EPNP}.
2014-05-30 23:59:32 +01:00
Ilya Krylov
3678020c28
Added license to source files
2014-05-20 12:37:37 +04:00
Roman Donchenko
3d7a457c97
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
Ilya Krylov
0d2fab86b4
Changed documentation for namespace fisheye
2014-05-19 18:16:00 +04:00
Hernan Badino
ca40d635e4
Switched insertion of connected components in filterSpecklesImpl
2014-05-19 10:12:07 -04:00
Ilya Krylov
651b13f72a
Refactored class Fisheye to namespace fisheye
2014-05-19 17:55:32 +04:00
Hernan Badino
9a371de93b
Switched insertion of connected components in filterSpecklesImpl
2014-05-16 18:49:45 -04:00
Ilya Krylov
c30fef1f9d
Fixed build issues
2014-05-14 18:58:39 +04:00
Roman Donchenko
c607dadc49
Merge pull request #2729 from StevenPuttemans:bug_3252
2014-05-13 14:17:09 +04:00
StevenPuttemans
b382984810
fix bug 3252
2014-05-12 15:01:15 +02:00
StevenPuttemans
2b4241c10b
fixed bug 3484
2014-05-12 14:40:12 +02:00
Ilya Krylov
e4a9c0f184
Fixed review comments
2014-05-12 15:37:47 +04:00
Alexander Alekhin
eb240cc206
Merge pull request #2697 from PhilLab:master
2014-05-08 16:57:50 +04:00
Ilya Krylov
349ff631a5
Added sample of work of Fisheye::undistortImage and its description to documentation. Removed readPoints and readExtrinsic (useless)
2014-05-07 20:53:07 +04:00
Ilya Krylov
1f94b7dfc9
minor
2014-05-06 11:17:10 +04:00
Ilya Krylov
ef01044b2f
Added documentation for Fisheye::stereoCalibrate
2014-05-06 11:09:22 +04:00
PhilLab
4ffeb01cfd
Update solvepnp.cpp
...
Clarified assert message for allowed PnP flags
2014-05-05 17:44:59 +02:00
Ilya Krylov
50b291995a
Added tests for stereoCalibrate
2014-05-05 17:23:03 +04:00
Ilya Krylov
c2341fd446
Added stereoCalibrate for Fisheye camera model
2014-05-05 14:21:24 +04:00
Alexander Alekhin
b62e59aac0
icv: enable functions
2014-04-29 15:36:43 +04:00
Ilya Krylov
e6aa8ce932
Corrected notes
2014-04-29 10:24:39 +04:00
Ilya Krylov
f0f741b796
Added documentation
2014-04-28 15:27:30 +04:00
Ilya Lavrenov
59876cfb34
fixed compilation
2014-04-28 14:04:41 +04:00
Ilya Krylov
05ee15f108
Added FisheyeTest
2014-04-28 12:01:27 +04:00
Samson Yilma
de55126b69
Fixed warnings and parameter name mismatches, added #include needed in some platforms.
2014-04-27 13:02:36 -04:00
Samson Yilma
e6420bde73
Added function decomposeHomographyMat. New files added are homography_decomp.cpp and test_homography_decomp.cpp.
...
Modified files calib3d.hpp and camera_calibration_and_3d_reconstruction.rst.
2014-04-26 20:13:27 -04:00
Ilya Krylov
35e1b322cb
Added test for jacobians
2014-04-25 18:36:48 +04:00
Ilya Krylov
9c7e0bfd33
Added fisheye camera model
2014-04-25 14:49:36 +04:00
Ilya Lavrenov
51e2a8ec96
fixes
2014-04-22 14:51:39 +04:00
Ilya Lavrenov
fe644ede19
cv::multiply
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
9cc80a68db
fixed warnings
2014-04-21 13:14:55 +04:00
Ilya Lavrenov
76c415ff49
cv::filterSpeckles
2014-04-21 13:14:55 +04:00
Roman Donchenko
799d2dabd6
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/test/test_arithm.cpp
modules/cuda/src/cascadeclassifier.cpp
modules/imgproc/doc/geometric_transformations.rst
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/moments.cpp
2014-04-14 16:08:02 +04:00
Maks Naumov
b033a63e63
fix typo in test_cameracalibration
2014-04-09 14:41:16 +03:00
Ilya Lavrenov
aa5326c231
cv::norm -> cvtest::norm in tests
...
Conflicts:
modules/core/src/stat.cpp
2014-04-08 14:49:20 +04:00
Alexander Karsakov
4ceaf44fa0
Fixed incorrect calculation of best_disp
2014-03-27 11:21:32 +04:00
Alexander Karsakov
8c39b4e8b6
Fixed stereoBM for Intel CPU.
2014-03-26 11:53:36 +04:00
Konstantin Matskevich
1a43ed9893
finalizing
2014-03-17 10:42:19 +04:00
Konstantin Matskevich
af1084eb58
speedUp
2014-03-14 18:00:13 +04:00
Konstantin Matskevich
91e4334227
temp
2014-03-14 18:00:12 +04:00
Konstantin Matskevich
18a59b48ba
fixes
2014-03-14 18:00:12 +04:00
Konstantin Matskevich
ddc235172e
new approach
2014-03-14 18:00:11 +04:00
Konstantin Matskevich
a5d989f346
new attempt
2014-03-14 18:00:11 +04:00
Konstantin Matskevich
799d7e7a50
bad experiment =(
2014-03-14 18:00:10 +04:00
Konstantin Matskevich
0904f10ab5
optimizations
2014-03-14 18:00:10 +04:00
Konstantin Matskevich
bfc843a5f5
added optimization
2014-03-14 18:00:09 +04:00
Konstantin Matskevich
b5f717b6b3
stereoBM
2014-03-14 18:00:09 +04:00
Roman Donchenko
fd8f2c8d23
Merge pull request #2463 from ziyangli:master
2014-03-12 18:51:41 +04:00
ziyangli
bbe8654c3d
cleanup
2014-03-12 18:16:54 +08:00
Ziyang LI
4f5896493e
remove a whitepace
2014-03-12 18:14:43 +08:00
Roman Donchenko
95a55453df
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
Ziyang LI
786e3b9eee
Moved x = 0 into the parenthesis
...
Easier to understand
2014-03-10 17:33:13 +08:00
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +04:00
Roman Donchenko
db85c35e69
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Ilya Lavrenov
eedf86402d
typos
2014-03-02 21:04:17 +04:00
Andrey Pavlenko
57b6850d74
Merge pull request #2415 from vpisarev:fix_stereobm_sse
2014-02-27 09:37:04 +04:00
Vadim Pisarevsky
a3aced20c1
fixed difference between SSE2 and C branches of StereoBM; they should now produce absolutely the same results
2014-02-25 18:13:51 +04:00
Ilya Lavrenov
ce0557ebb8
fixed defects from Xcode
2014-02-25 17:33:12 +04:00
Ilya Lavrenov
32eb38ec98
fixed defects from coverity.com
2014-02-23 20:21:08 +04:00
Roman Donchenko
721d0145e0
Merge pull request #2002 from abak:stereo_calibrate
2014-02-05 17:47:27 +04:00
Vadim Pisarevsky
7cfb7bc8cd
Merge pull request #2120 from prclibo:master
2014-02-03 16:59:04 +04:00
Andrey Pavlenko
494f7e3657
Merge pull request #2158 from KonstantinMatskevich:testdata_path_calib3d
2014-01-20 23:35:06 +04:00
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
Roman Donchenko
79fcc06a4b
Merge pull request #2146 from SpecLad:merge-2.4
2014-01-17 16:28:30 +04:00
Konstantin Matskevich
e9e9e00d45
replaced sprintf with cv::format
2014-01-17 13:01:12 +04:00
Roman Donchenko
63c61b4b98
Revert "replaced sprintf with cv::format"
...
Fixing build breakage.
This reverts commit b83eff7ecf
.
2014-01-16 17:58:26 +04:00
Konstantin Matskevich
b83eff7ecf
replaced sprintf with cv::format
2014-01-16 16:18:02 +04:00
Konstantin Matskevich
ab18c2d132
changed testdata path for calib3d
2014-01-15 15:08:09 +04:00
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Bo Li
d155639db5
grammar fix
2014-01-07 09:57:40 +08:00
Bo Li
d444af5bb2
updated decomposeEssentialMat doc
2014-01-07 09:54:12 +08:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Adrien BAK
6ae16ebec3
update doc accordingly
2013-12-17 16:51:33 +09:00
Adrien BAK
c5c3fd4443
modify signature of stereoCalibrate for consistency
2013-12-17 14:53:44 +09:00
Anatoly Baksheev
4c66b87698
fixed -Wshadow and other warnings, added rvec test
2013-12-07 20:33:50 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
huangs
f02ce90559
minX1 should be max(-maxD,0) not max(maxD,0), avoid black band at left
2013-11-12 22:37:23 +08:00
Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
Kevin
8f995fac88
Change intrinsic camera matrix initialization
...
In the function cvInitIntrinsicParams2D the principal point for
normalized image coordinates is set to 0/0. This updates the function
to initialize the principal point at 0.5/0.5.
2013-10-19 02:10:20 -05:00
Ilya Lavrenov
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
Vladislav Vinogradov
e675684c81
fix bug #3277 (findCirclesGrid failures):
...
findHomagraphy can return empty Mat in master branch
2013-09-24 14:45:13 +04:00
look4pritam
a430abd02e
The thin prism distortion coefficient related small bug is fixed.
2013-09-16 13:39:11 +05:30
Vadim Pisarevsky
84022b0c19
fix thin-prism coefficients at 0's in the stereo calibration function unless the flag CALIB_THIN_PRISM_MODEL is explicitly set
2013-09-13 13:32:42 +04:00
look4pritam
7fd7bbc9f1
The prism distortion coefficients are added for the stereo calibration.
2013-09-12 15:17:11 +05:30
Alexander Mordvintsev
79d51c3398
expose findEssentialMat, decomposeEssentialMat and recoverPose to Python
2013-09-09 14:02:05 +04:00
Roman Donchenko
c7d2fdc4b2
Fixed some dubious uses of tbb::task_scheduler_init.
2013-09-05 19:03:00 +04:00
Roman Donchenko
bd70a033fc
Boring changes - calib3d.
2013-09-05 18:26:43 +04:00
Roman Donchenko
11dcd4f4f3
Merge pull request #1356 from SpecLad:homography-uninit
2013-08-28 18:05:10 +04:00
Roman Donchenko
5e4ebf3403
Fixed incomplete matrix initialization in HomographyRefineCallback.
2013-08-28 13:20:14 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00