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
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
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
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
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
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Ilya Lavrenov
43e4946cca
fix for fisheye
2014-07-02 11:53:53 +04:00
Ilya Krylov
84bb77e914
Fixed android and windows x64 build issues
2014-06-23 17:06:40 +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
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
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
