StevenPuttemans
d4ec359f11
Fixing errors
2014-09-22 22:12:27 +02:00
Marc Rollins
c8ede7c9ea
Updating documentation to reflect division operations.
2014-09-22 12:07:16 -07:00
Marc Rollins
f32a6fb9a1
Adding element-wise division operators to Point3_ class.
2014-09-22 11:59:11 -07:00
Marc Rollins
fb9bbf99c4
Adding division operators to Point_ class.
...
Performs element-wise division.
2014-09-22 11:54:52 -07:00
Artur Wieczorek
3603102c89
Fixed assertion warning in MSMF frame grabber
2014-09-22 19:38:04 +02:00
Artur Wieczorek
a615102947
Fixed MSMF video capture initialization
2014-09-22 19:35:36 +02:00
Vadim Pisarevsky
1c0b9469f5
Merge pull request #3248 from ilya-lavrenov:arm_sum
2014-09-22 17:32:36 +00:00
Ilya Lavrenov
515be70867
Neon optimization of cv::convertScaleAbs
2014-09-22 15:47:46 +00:00
Vadim Pisarevsky
9c91d0103f
Merge pull request #3247 from a-wi:CMake_MSMF_configuration
2014-09-22 15:31:09 +00:00
Vadim Pisarevsky
37a1767286
Merge pull request #3243 from a-wi:MSMF_linking_error
2014-09-22 15:29:32 +00:00
Vadim Pisarevsky
488920168a
Merge pull request #3239 from mshabunin:xfeatures2d_fix
2014-09-22 15:28:42 +00:00
xantares
d391a6d49f
Also test for target.
2014-09-22 15:14:35 +00:00
StevenPuttemans
03662c0589
fix blobdetector
2014-09-22 13:58:45 +02:00
Ilya Lavrenov
27b933ba5a
Neon optimization of cv::sum
2014-09-22 09:22:03 +00:00
Maksim Shabunin
0d7b44db50
Java wrappers now support nested namespaces and classes
...
- wrapper support python3
- added wrapper log
- generating full name for nested namespaces and classes
2014-09-22 11:47:03 +04:00
Maksim Shabunin
6337fd0650
Support of bioinspired contrib module wrapping
...
- added java wrapper
- disabled python wrapper
2014-09-22 11:43:29 +04:00
Artur Wieczorek
7c354c14f7
CMake configuration for MSMF capture
2014-09-21 21:03:41 +02:00
Artur Wieczorek
d2ba09e6ff
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
2014-09-19 22:46:09 +02:00
Tom Stellard
934394c5e2
ocl: Don't use 'inline' attribute on functions
...
In C99 'inline' is not a hint to the compiler to inline the function,
it is an attribute that affects the linkage of the function. 'inline'
functions are required to have a definition in a different compiliation
unit, so compilers are free to delete 'inline' functions if they want to.
This issue can be seen in Clang when compiling at -O0. Clang
will sometimes delete 'inline' functions which creates an invalid
program.
Issue 3746: http://code.opencv.org/issues/3746
2014-09-19 16:13:57 -04:00
Vadim Pisarevsky
6c3cadbd73
Merge pull request #3240 from a-wi:MSMF_compilation_errors
2014-09-19 17:36:13 +00:00
Vadim Pisarevsky
4dda2002f6
Merge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl
2014-09-19 17:35:07 +00:00
Artur Wieczorek
539f8032dc
Fixed compilation errors under VS 2010 and Win 7
2014-09-19 17:07:52 +02:00
WilhelmHannemann
f8c5128729
Merge branch 'bugfix_brute_force_match_cl' of https://github.com/WilhelmHannemann/opencv into bugfix_brute_force_match_cl
2014-09-19 16:42:59 +02:00
WilhelmHannemann
150487feda
Bugfix brute_force_match.cl (see http://code.opencv.org/issues/2837 ): wrong results for non-float descriptors in OpenCL BruteForceMatcher
2014-09-19 16:41:54 +02:00
WilhelmHannemann
b767613d20
Bugfix brute_force_match.cl (Bug #2837 ): wrong results for non-float descriptors in OpenCL BruteForceMatcher
2014-09-19 16:31:11 +02:00
Vadim Pisarevsky
892999c40c
Merge pull request #3237 from mshabunin:java_test_detection
2014-09-19 13:35:47 +00:00
Vadim Pisarevsky
197b2e75e1
Merge pull request #3238 from vpisarev:bfmatcher_fix
2014-09-19 13:21:05 +00:00
Maksim Shabunin
5e3e438edb
Fix xfeatures2d dependencies
2014-09-19 16:41:33 +04:00
Vadim Pisarevsky
3516e14e05
Merge branch 'bug_3172' of https://github.com/elmarb/opencv into bfmatcher_fix;
...
use different fix for the problem, embedded right into the BFMatcher.
2014-09-19 15:31:21 +04:00
E Braun
d82b918a7b
fix for bug 3172
2014-09-19 14:47:43 +04:00
E Braun
f60726b090
Revert "fix for bug 3172"
...
This reverts commit ed2cdb71e5 .
2014-09-19 14:47:43 +04:00
E Braun
1675b23a64
fix for bug 3172
2014-09-19 14:47:43 +04:00
E Braun
aa9da6e433
regression test for bug 3172
2014-09-19 14:47:43 +04:00
Vadim Pisarevsky
772f6208db
Merge pull request #3235 from Atanahel:gbt_bugfix
2014-09-19 09:42:01 +00:00
Maksim Shabunin
2992e3a1b6
Fixed android test detection and some spaces in CMakeLists.txt
2014-09-19 13:11:59 +04:00
Maksim Shabunin
cff5e3ee88
Changed java tests detection procedure
2014-09-19 12:34:42 +04:00
Vadim Pisarevsky
d1fba0686e
Merge pull request #3233 from niebles:master
2014-09-18 17:47:55 +00:00
Vadim Pisarevsky
0cf1de8eea
Merge pull request #3236 from vpisarev:fix_traincascade
2014-09-18 17:45:28 +00:00
Juan Carlos Niebles
0c988f00bc
Merge github.com:Itseez/opencv
2014-09-18 12:00:28 -05:00
Juan Carlos Niebles
dc49e11527
removed setter methods, replaced by CV_PROP_RW macro
2014-09-18 09:39:35 -05:00
Vadim Pisarevsky
d1afa0e370
Merge pull request #3234 from vpisarev:fixed_photo_test_failure
2014-09-18 13:06:54 +00:00
Stephen Mell
5947519ff4
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
2014-09-18 16:54:22 +04:00
Vadim Pisarevsky
1578dd1027
Merge pull request #2702 from GregoryMorse:patch-3
2014-09-18 12:38:54 +00:00
Vadim Pisarevsky
06e55ddf38
Merge pull request #2893 from ilya-lavrenov:tapi_vector_width_intel
2014-09-18 12:05:24 +00:00
Benoit Seguin
084835ec30
Fixing a line where integer data was treated as floating point data.
2014-09-18 14:03:13 +02:00
Vadim Pisarevsky
470f427a95
Merge pull request #3232 from Chuanbo-Weng:master
2014-09-18 11:48:29 +00:00
Vadim Pisarevsky
aa6ba149bc
make sure ptr<> is called with proper parameter, otherwise the assertion fails
2014-09-18 15:47:59 +04:00
Vadim Pisarevsky
a67484668e
Merge pull request #2711 from GregoryMorse:patch-5
2014-09-18 11:28:58 +00:00
Vadim Pisarevsky
26fd37b27d
Merge pull request #3212 from mshabunin:python_cross_build_2.4
2014-09-18 08:57:32 +00:00
Juan Carlos Niebles
1162f0ed63
fixed whitespaces
2014-09-17 19:02:12 -05:00