Maksim Shabunin
ef3d02214b
Fixing iOS clang warnings, part 2
2014-10-17 18:14:54 +04:00
Maksim Shabunin
d3821e8cd7
Forgotten punctuation
2014-10-17 18:14:54 +04:00
Maksim Shabunin
420737e098
Fixing iOS clang warnings, part 1
2014-10-17 18:14:54 +04:00
Maksim Shabunin
630eddf25a
Extracted repeated cmake instruction block
2014-10-17 18:14:53 +04:00
Maksim Shabunin
f379bcc6d3
Suppressed some iOS framework compilation warnings
2014-10-17 18:14:53 +04:00
Vadim Pisarevsky
22ff1e8826
Merge pull request #3339 from vpisarev:refactor_features2d_take4
2014-10-17 14:07:06 +00: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
3f37e034a0
another fix in opencv_world
2014-10-17 16:09:09 +04:00
Vadim Pisarevsky
8d9e619412
fixed opencv_world build
2014-10-17 16:05:38 +04:00
Vadim Pisarevsky
1a809ca89b
fixed msvc compile warning
2014-10-17 15:56:27 +04:00
Vadim Pisarevsky
cc11a8d183
Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into refactor_features2d_take4
...
Conflicts:
modules/features2d/src/orb.cpp
2014-10-17 15:13:35 +04:00
Vadim Pisarevsky
54e65598bd
fixed error in OpenCL ORB
2014-10-17 15:02:57 +04:00
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
Vadim Pisarevsky
d36b546df8
trying to fix strange compiler bug
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
9c9ecc22e2
fixed opencv_java build
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
fa76c634ec
ok; all the tests now pass
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
01d3848f17
all the tests now pass except for MSER
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
162384a838
fixed several test failures; currently 9 out of 73 tests fail
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
06d4aa6060
now all the samples and opencv_contrib compile!
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
09df1a286b
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
2e915026a0
yet another attempt to refactor features2d; the first commit, features2d does not even compile
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
f6f839eb3c
trying to resolve the merge conflict
2014-10-17 14:46:08 +04:00
Vadim Pisarevsky
c5292c2549
fixed error in OpenCL ORB
2014-10-17 14:30:12 +04:00
Vadim Pisarevsky
c422bdc3f8
fixed some more compile errors and test failures
2014-10-17 14:22:02 +04:00
Vadim Pisarevsky
48a860a335
trying to fix strange compiler bug
2014-10-16 23:10:00 +04:00
Vadim Pisarevsky
61cddd8b63
fixed opencv_java build
2014-10-16 22:52:04 +04:00
Vadim Pisarevsky
25a7d023dd
ok; all the tests now pass
2014-10-16 21:59:38 +04:00
Vadim Pisarevsky
c5261ea3d2
all the tests now pass except for MSER
2014-10-16 20:58:29 +04:00
Alexander Alekhin
af1d29db83
Merge pull request #3332 from lupustr3:pvlasov/implementation_detector
2014-10-16 14:51:53 +00:00
Vadim Pisarevsky
97a5dd0ead
fixed several test failures; currently 9 out of 73 tests fail
2014-10-16 17:00:40 +04:00
Vadim Pisarevsky
d017faa06c
now all the samples and opencv_contrib compile!
2014-10-16 16:34:22 +04:00
Alexander Alekhin
4525a5f2be
Merge pull request #3338 from ilya-lavrenov:ios_fixes
2014-10-16 11:53:41 +00:00
Vadim Pisarevsky
b30ad42609
Merge pull request #3270 from boaz001:patch-1
2014-10-16 10:09:28 +00:00
Ilya Lavrenov
c54ef78220
fixes
2014-10-16 09:55:22 +04:00
Boaz Stolk
ae81006eab
Applied proposed fix
2014-10-15 22:36:38 +02:00
Vadim Pisarevsky
5e667ee53a
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
2014-10-15 22:49:17 +04:00
Vadim Pisarevsky
a10a7279a8
Merge pull request #3334 from micha137:patch-2
2014-10-15 10:32:16 +00:00
Vadim Pisarevsky
968fe91c8e
Merge pull request #3333 from micha137:patch-1
2014-10-15 10:31:59 +00:00
Vadim Pisarevsky
18ef0cfe81
Merge pull request #3335 from ilya-lavrenov:neon_ios
2014-10-15 10:29:54 +00: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
Adrien BAK
5442de7d99
adjust numerical precision for windows build
2014-10-15 12:47:53 +09:00
Adrien BAK
82a5ff8540
fix warnings in samples
2014-10-15 11:09:33 +09:00
Adrien BAK
9972059476
suppress warnings
2014-10-14 19:07:15 +09:00
Adrien BAK
53d11f490d
whitespace
2014-10-14 16:45:02 +09:00
Adrien BAK
5c98209127
whitespaces
2014-10-14 16:31:22 +09:00
Adrien BAK
ee210afc44
white space
2014-10-14 16:10:53 +09:00
Adrien BAK
cb76d00f5f
precalculate indices
2014-10-14 16:08:45 +09:00
Adrien BAK
419450689b
remove unnecessary buffer copies
2014-10-14 16:08:45 +09:00
Adrien BAK
b4504639c8
refactor poisson_solver
2014-10-14 16:08:45 +09:00
Adrien BAK
6bfea73716
move calls to ptr<>
2014-10-14 16:08:45 +09:00