Vadim Pisarevsky
ca19ae8b5a
in solvePnPRansac call the solvePnP in the end with all the inliers to get more precise estimate
2015-03-16 16:56:26 +03:00
Vadim Pisarevsky
4ab525c880
Merge pull request #3810 from StevenPuttemans:upgrade_traincascade_default_memory
2015-03-16 10:02:07 +00:00
Vadim Pisarevsky
5c352c9146
temporarily use EPNP in SolvePnP instead of UPNP or DLS algorithms, since the latter two are not quite stable
2015-03-16 12:46:24 +03:00
Vadim Pisarevsky
3c54c50c5a
Merge pull request #3802 from sanuj:master
2015-03-16 09:25:41 +00:00
Vadim Pisarevsky
f80e7530f3
Merge pull request #3827 from MSOpenTech:license-26
2015-03-16 09:11:24 +00:00
Vadim Pisarevsky
c6e9280373
Merge pull request #3816 from ilya-lavrenov:il/cvround
2015-03-16 09:09:55 +00:00
Vadim Pisarevsky
f9b2444735
Merge pull request #3826 from mshabunin:fix-install-paths
2015-03-16 09:08:54 +00:00
Vadim Pisarevsky
259a54a6dd
Merge pull request #3830 from NaerChang:issue.3710
2015-03-16 09:05:42 +00:00
Vadim Pisarevsky
a1f86d01e2
Merge pull request #3831 from Dmitry-Me:reduceVariableScope7
2015-03-16 09:05:18 +00:00
Naer Chang
cdc9bc397d
Revert "issue 3710"
...
Trying to fix whitespace issue.
This reverts commit dcc2512f58
.
2015-03-14 18:32:46 -04:00
Olexa Bilaniuk
ac1099deb8
Merge remote-tracking branch 'refs/remotes/upstream/master'
2015-03-14 12:41:56 -04:00
Olexa Bilaniuk
7e3cc44738
More docs on variable accesses.
...
Listed accesses for more functions.
2015-03-14 12:41:25 -04:00
Dmitry-Me
8ed4bae4dd
Reduce variable scope, make formatting consistent with surrounding code
2015-03-14 12:50:42 +03:00
Naer Chang
dcc2512f58
issue 3710
...
added a check to prevent illegal access to operator[] when vector is empty
2015-03-14 02:56:29 -04:00
ippei ito
7d665a4754
Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
2015-03-14 09:35:53 +09:00
Scott Graybill
3d2c0ed97f
Removed check on limits. A common use of HoughLines would be to restrict theta to be between a small negative number and a small positive number, e.g. -pi/16 to pi/16. This wasn't possible with the previous checks.
2015-03-13 17:04:13 -07:00
ippei ito
f7d52c774e
Fix compile error on linux change cv::InputArray& to cv::InputArray
2015-03-14 06:58:34 +09:00
ippei ito
8efdfd9dfc
Fix unused-parameter Warning
2015-03-14 06:07:55 +09:00
ippei ito
cd42e38013
FlannBasedMatcher(LshIndex) in the feature2d optimization for continuance additional train()
...
Current implementation of miniflann is releasing the trained index, and
rebuilding the index from the beginning.
But, some indexing algorithms like the LSH are able to add the indexing
data after that.
This branch is implementation of that optimization for LshIndex
FlannBasedMatcher in the feature2d.
2015-03-14 04:38:07 +09:00
Vadim Pisarevsky
1760078f67
trying to make solvePnPSmallPoints pass
2015-03-13 20:11:33 +03:00
Maxim Kostin
79f512337d
Changed encoding from ANSI to UTF8.
2015-03-13 19:28:36 +03:00
Vadim Pisarevsky
7e07220440
made the solvepnp a bit more modest; test 5-point configuration instead of 4-point in some cases; reduce the noise in 4-point configurations in other cases
2015-03-13 18:04:23 +03:00
Vadim Pisarevsky
930808c22b
Merge pull request #3820 from LorenaGdL:patch-1
2015-03-13 13:20:09 +00:00
Vadim Pisarevsky
04f16965d5
Merge pull request #3780 from StevenPuttemans:fix_locale_master
2015-03-13 13:16:09 +00:00
Vadim Pisarevsky
133bd56436
Merge pull request #3769 from adamgreig:fix-py3-submodules
2015-03-13 13:15:51 +00:00
Vadim Pisarevsky
18904036dc
Merge pull request #3825 from alalek:fix_msvs2010_build
2015-03-13 13:02:43 +00:00
Maxim Kostin
6cef4eba29
Replacing license headers per PR-3700 feedback. Updates #26
2015-03-13 14:33:09 +03:00
Maksim Shabunin
632afe6ae3
Fixed mangled install layout on unix machines
2015-03-13 14:18:37 +03:00
Alexander Alekhin
50b99e5aef
fix compilation on MSVS2010
2015-03-12 19:07:53 +03:00
Milania1
339e6aa782
fixed error in hough lines tutorial (the point (9,4) is not on the lines, but the point (4,9) is)
2015-03-12 16:46:25 +01:00
Pavel Vlasov
085409340e
Implementation collector update;
...
Moved out of TLS to properly collect data from different threads;
Concurrent access guards were added to collection functions;
2015-03-12 17:58:03 +03:00
Vadim Pisarevsky
309eb3c122
Merge pull request #3815 from StevenPuttemans:add_camera_IP_regulations
2015-03-12 14:39:48 +00:00
Vadim Pisarevsky
2594e5e384
Merge pull request #3800 from StevenPuttemans:add_parameter_info_annotation
2015-03-12 14:29:04 +00:00
Vadim Pisarevsky
74e88cc0f1
Merge pull request #3801 from StevenPuttemans:add_parameter_info_annotation_master
2015-03-12 14:28:19 +00:00
Vadim Pisarevsky
79a77cb91f
Merge pull request #3819 from MSOpenTech:readme-24
2015-03-12 13:11:59 +00:00
Vadim Pisarevsky
06703c9d56
Merge pull request #3817 from SpecLad:forward-ports
2015-03-12 12:15:24 +00:00
Vadim Pisarevsky
362c1a23ea
Merge pull request #3821 from i-ito:master-flann-lsh-addable-index
2015-03-12 12:14:23 +00:00
ippei ito
518fd59a10
fixed whitespace error
2015-03-12 01:09:15 +09:00
ippei ito
49b38fe793
Fixed compile error build with VisualStudio2013 on windows.
...
REG_NONE defined in ml.hpp conflicts with defined in Winnt.h
2015-03-12 00:32:17 +09:00
LorenaGdL
b21b24fd8a
Update train_HOG.cpp
...
Incorrect number of input arguments in main function
2015-03-11 14:18:07 +01:00
Ilya Lavrenov
6f8b3fc633
cvRound
2015-03-11 16:14:39 +03:00
Maxim Kostin
b194812f5a
Fixed trailing whitespace.
2015-03-11 13:22:22 +03:00
Adam Greig
211a131351
Fix Python3 binding's submodules
...
Previously the Python3 cv2 package ends up with no submodules (bgsegm, face,
etc) in it, which makes a lot of functionality unusable. By not writing over
our root reference we ensure the new submodules are added to the correct cv2
module.
2015-03-10 22:07:53 +00:00
Maxim Kostin
052c010d3f
Reformatted since this is not a markdown file
2015-03-10 17:02:31 +03:00
Max Kostin
deb2cb752b
Updates README for setup_script
...
Updates README to reflect setup_script build capabilities and requirements to setup binaries and includes for sample applications. Fixes #24
2015-03-10 16:58:06 +03:00
Roman Donchenko
c71e94f054
Mark the libs component required
...
Everything else depends on it, after all.
(cherry picked from commit cf54e3b97e
)
Conflicts:
cmake/OpenCVPackaging.cmake
2015-03-10 16:24:23 +03:00
Roman Donchenko
8a732e306f
Add component display names
...
(cherry picked from commit 6d52ea8984
)
2015-03-10 16:24:23 +03:00
Roman Donchenko
87eb3f6e68
Update the CPack variables to match the changes in asmorkalov/CMake#1
...
Which also happens to align the non-Debian specific variables
with the ones used by upstream CMake.
(cherry picked from commit b8c60234c3
)
Conflicts:
cmake/OpenCVPackaging.cmake
2015-03-10 16:24:23 +03:00
Roman Donchenko
35760bb6bf
Add a script to run all tests on Windows
...
It's pretty much a simplified copy of the Linux script, lacking fancy colors.
Also, I had to drop Python testing, because it's not easy to pass the Python
module location to the script, and I have no pressing need to run the Python
tests at the moment.
(cherry picked from commit c1e3ca170e
)
Conflicts:
CMakeLists.txt
2015-03-10 16:24:23 +03:00
Roman Donchenko
592122bf4f
Install data on Windows
...
Because why not?
(cherry picked from commit e8a7394009
)
Conflicts:
data/CMakeLists.txt
2015-03-10 12:55:17 +03:00