Dmitry-Me
c4c3e4fe83
Remove unneeded indirections
2015-02-18 18:25:17 +03:00
Maksim Shabunin
e57359a3a0
Documentation: set max-width property for inserted images
2015-02-18 18:19:36 +03:00
Vadim Pisarevsky
6ff2f395e6
Merge pull request #3702 from Dmitry-Me:reduceVariableScope
2015-02-18 13:55:58 +00:00
Vadim Pisarevsky
009ab70272
Merge pull request #3711 from nisargthakkar:optical_flow_doc_fix
2015-02-18 13:52:09 +00:00
Vadim Pisarevsky
b64e106bb1
Merge pull request #3703 from BKNio:fixing_bad_alloc
2015-02-18 13:50:14 +00:00
Vadim Pisarevsky
1d356b6a48
Merge pull request #3714 from uqtimes:fixUIImageToMat
2015-02-18 13:49:14 +00:00
Vadim Pisarevsky
6b371865af
Merge pull request #3716 from mshabunin:fix-vs-solution-build
2015-02-18 13:48:18 +00:00
Vadim Pisarevsky
87f86b31fa
Merge pull request #3715 from mshabunin:enable-stl
2015-02-18 12:12:14 +00:00
Vadim Pisarevsky
4f8bf98e6f
Merge pull request #3706 from exeltior:patch-1
2015-02-18 11:30:05 +00:00
Maksim Shabunin
2085251df2
Exclude object libraries from visual studio solution build
2015-02-18 14:16:54 +03:00
Maksim Shabunin
c41db69f98
Fixed cmake issues
2015-02-18 12:44:48 +03:00
Maksim Shabunin
553020c448
Enabled STL usage within the library
2015-02-18 12:36:50 +03:00
UQ Times
1944443d10
iOS: fix crash from overrelease in UIImageToMat
...
- previous pull request: https://github.com/Itseez/opencv/pull/3340
2015-02-18 13:30:08 +09:00
Vladislav Vinogradov
671b59aa9d
fix windows build with CUDA
...
rename cv::cuda::internal namespace
to cv::cuda::device to prevent conflicts
with cv::internal
2015-02-17 21:50:39 +03:00
Nisarg Thakkar
437ef99ba5
Fixed doc error in optical flow
2015-02-17 22:14:57 +05:30
StevenPuttemans
2738939126
add same functionality as 2.4
2015-02-17 10:25:18 +01:00
Maksim Shabunin
79e8f0680c
Updated ml module interfaces and documentation
2015-02-17 11:46:14 +03:00
exeltior
b51805e245
Update mser.cpp
...
Need to initialize boolean variable pass2Only, otherwise the result is not predictable
2015-02-16 18:17:41 +01:00
Vadim Pisarevsky
d1a15097fe
Merge pull request #3664 from wangyan42164:ocl_cascasde_barrier
2015-02-16 15:42:26 +00:00
Ahmatnurov Dinar
21ee113af3
fixig std::bad_alloc
...
if points0 is empty checkVector(2) return -1, it causes the exception
2015-02-16 17:15:54 +03:00
Dmitry-Me
103687871d
Reduce variable scope
2015-02-16 15:39:52 +03:00
Maksim Shabunin
da383e65e2
Remove deprecated methods from cv::Algorithm
2015-02-16 15:28:54 +03:00
Vadim Pisarevsky
fdf31ec14f
Merge pull request #3650 from StevenPuttemans:fix_tutorials_master
2015-02-16 11:45:37 +00:00
Vadim Pisarevsky
d509ecd19a
Merge pull request #3666 from mshabunin:meta-module
2015-02-16 11:43:30 +00:00
Vadim Pisarevsky
23633c1945
Merge pull request #3685 from alalek:ocl_android_default_off
2015-02-16 11:31:02 +00:00
Vadim Pisarevsky
edab3916aa
Merge pull request #3696 from Dmitry-Me:shouldPassByReference
2015-02-16 11:29:22 +00:00
Vadim Pisarevsky
7164f22347
Merge pull request #3701 from jet47:internal-namespace
2015-02-16 11:27:05 +00:00
Vladislav Vinogradov
a932d8aba1
use full qualified name for all internal namespaces to prevent ambiguous symbol errors
2015-02-16 11:31:21 +03:00
Olexa Bilaniuk
86b6cab7fa
Merge branch 'master' of https://github.com/obilaniu/opencv
...
Conflicts:
modules/calib3d/src/fundam.cpp
modules/calib3d/src/rhorefc.cpp
2015-02-13 08:20:09 -05:00
Olexa Bilaniuk
5d79b1092f
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
2015-02-13 08:12:11 -05:00
Olexa Bilaniuk
e5696bc5e6
Whitespace change reverts to minimize delta w.r.t master.
2015-02-13 08:07:15 -05:00
Hamid Bazargani
5070f2a334
Fix sacCalcJacobianErrors arguments. (curr.inl replaced with best.inl)
...
Fix the issue given NULL inlMask
2015-02-13 00:44:19 -05:00
Hamid Bazargani
44f906eb35
Fix sacCalcJacobianErrors arguments. (curr.inl replaced with best.inl)
...
Fix the issue given NULL inlMask
2015-02-13 00:38:19 -05:00
Hamid Bazargani
e22678018b
Fix sacCalcJacobianErrors arguments. (curr.inl replaced with best.inl)
...
Fix the issue given NULL inlMask
2015-02-13 00:30:18 -05:00
Hamid Bazargani
42176f8eb1
Fix sacCalcJacobianErrors arguments. (curr.inl replaced with best.inl)
...
Fix the issue given NULL inlMask
2015-02-13 00:09:37 -05:00
ASUS
9a555063e8
Fix sacCalcJacobianErrors arguments. (curr.inl replaced with best.inl)
...
Fix the issue given NULL inlMask
2015-02-12 23:34:48 -05:00
ASUS
6b04351ce1
Merge branch 'accuracy' of https://github.com/obilaniu/opencv into accuracy
...
Conflicts:
modules/calib3d/src/rhorefc.cpp
2015-02-12 21:27:08 -05:00
ASUS
6dbf13d7b5
saveBestModel() is modified. accuracy test is passed.
2015-02-12 21:22:52 -05:00
Olexa Bilaniuk
ff2509af56
Fixed printouts in testcase to blame the correct method for a failure.
...
Previously, certain test failures by the method RHO would result in an
error blaming RANSAC instead. The fix involves a parameter change to
several functions in test_homography.cpp.
2015-02-12 14:42:37 -05:00
Dmitry-Me
c3f8fc41b7
Parameters should have been passed by reference
2015-02-12 17:32:43 +03:00
Maksim Shabunin
a5a510da4b
Support for compound modules, support for contrib_world
2015-02-10 18:30:05 +03:00
Vadim Pisarevsky
5466e321b8
Merge pull request #3687 from Dmitry-Me:fixPossibleNullPtrDeref
2015-02-10 12:17:11 +00:00
Vadim Pisarevsky
f6b82d99ad
Merge pull request #3684 from SeninAndrew:master
2015-02-10 12:03:52 +00:00
Vadim Pisarevsky
dd1878c64f
Merge pull request #3688 from jet47:test-script-optional-color-3.0
2015-02-10 12:02:36 +00:00
Vladislav Vinogradov
6a3f33090d
make color output in run_test script optional
2015-02-09 15:24:46 +03:00
Dmitry-Me
ea48fcfc9f
Fix possible null pointer dereference
2015-02-09 12:38:02 +03:00
Vadim Pisarevsky
05e404c2ff
Merge pull request #3681 from jet47:fix-run-tests-script-3.0
2015-02-08 17:07:28 +00:00
Alexander Alekhin
79416cdf10
ocl: disable OpenCL by default for Android builds
2015-02-08 13:08:14 +03:00
Olexa Bilaniuk
ccd33a721e
Fixed build failures related to designSPRTTest().
2015-02-07 01:19:40 -05:00
Olexa Bilaniuk
7e273396c1
Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
2015-02-07 01:08:10 -05:00