Matthew Skolaut
f861d0d643
merge #ifs in highgui bindings
2016-06-21 17:16:16 -05:00
Matthew Skolaut
7284a77cd3
fix casting warning in python createButton binding
2016-06-20 21:07:24 -05:00
Matthew Skolaut
e8bfb48490
Merge branch 'master' of https://github.com/Itseez/opencv
...
Added python binding for createButton
2016-06-20 16:24:23 -05:00
Matthew Skolaut
9b959072a2
added python binding for createButton
2016-06-20 16:24:15 -05:00
Alexander Alekhin
4597b94099
Merge pull request #5980 from alalek:cmake_opencv_config
2016-06-20 15:27:43 +00:00
Alexander Alekhin
c6c651212c
cmake: refactoring of OpenCVConfig
...
- removed OpenCV_LIB_DIR* vars (they are broken and not required anymore)
- OpenCVConfig.cmake doesn't contain ANDROID/CUDA code if there is no such support
- removed OpenCV2_INCLUDE_DIRS_CONFIGCMAKE, merged into OpenCV_INCLUDE_DIRS_CONFIGCMAKE
- fix hard-coded relative paths for OpenCV_INSTALL_PATH
- removed OpenCV_TBB_ARCH
- switch OpenCVConfig.cmake into 2-level mode for Android SDK
2016-06-20 15:15:21 +03:00
Alexander Alekhin
7188e6e2ac
android: update build scripts
2016-06-20 15:15:21 +03:00
Alexander Alekhin
31952fbf1c
Merge pull request #6675 from pnordhus:matconstiterator_reference
2016-06-17 10:12:51 +00:00
Alexander Alekhin
bd9cc2dfc6
Merge pull request #6668 from yadavankit:master
2016-06-17 10:11:49 +00:00
Vadim Pisarevsky
547a2d29c3
Merge pull request #6535 from sovrasov:lapack-hal
2016-06-16 20:09:47 +00:00
Vadim Pisarevsky
4142e737b0
Merge pull request #6453 from sovrasov:extend_calibrateCamera
2016-06-16 18:28:49 +00:00
Alexander Alekhin
7fadf570b8
Merge pull request #6690 from alalek:cmake_fix_android_samples
2016-06-16 15:56:19 +00:00
Alexander Alekhin
777e1d38ba
cmake: fix JNI configuration problem for Android samples
...
Some CMake 3.x (2.8.12.2 is fine) provides broken build configurations
with following build error message:
ld: fatal error: -soname: must take a non-empty argument
Linker command line sample contains this:
"-shared -Wl,-soname, -o"
2016-06-16 14:32:07 +03:00
Alexander Alekhin
c3456c0754
Merge pull request #6685 from ioxp:dofDocu
2016-06-15 20:43:11 +00:00
Alexander Alekhin
68c63188eb
Merge pull request #6683 from alalek:cmake_hal
2016-06-15 17:18:56 +00:00
Philipp Hasper
45bd56e28a
rigidTransform: only four DoF
...
combinations of translation, rotation, and uniform scaling equals four degrees of freedom
2016-06-15 16:41:39 +02:00
Alexander Alekhin
f4ebc504d1
cmake: refactor HAL attaching process
2016-06-15 17:34:30 +03:00
Philipp Nordhus
4a529cd641
Return reference on iterator indirection/subscript
2016-06-11 15:17:52 +02:00
Ankit Yadav
c62eda023d
Fix typo
2016-06-11 17:56:58 +05:30
Alexander Alekhin
e3844e0f26
Merge pull request #6649 from adamrankin:msmf_crash_fix
2016-06-08 16:30:55 +00:00
Adam Rankin
2577194c70
Correcting return type from videoDevice::findType to be int thus allowing detection of failed device init request
2016-06-07 15:18:40 -04:00
Alexander Alekhin
1b6e02793c
Merge pull request #6645 from tomoaki0705:fixTypoEigen
2016-06-07 13:51:30 +00:00
Vladislav Sovrasov
46fb46c54e
Add an extended version of CalibrateCamera function
2016-06-07 12:31:11 +03:00
Vladislav Sovrasov
055f5c7395
Change names of some internal functions
2016-06-07 10:58:12 +03:00
Tomoaki Teshima
d1c1c01761
fix typo
2016-06-07 14:53:04 +09:00
Maksim Shabunin
532885c12b
Merge pull request #6607 from alalek:issue_6604
2016-06-06 09:20:58 +00:00
Maksim Shabunin
89a1e806b7
Merge pull request #6628 from sovrasov:hal_samples_update
2016-06-06 09:18:27 +00:00
Vladislav Sovrasov
901e1e4608
Update HAL samples
2016-06-03 11:52:30 +03:00
Vladislav Sovrasov
a2d0cc878c
Implement internal HAL for GEMM and matrix decompositions
2016-06-03 10:38:30 +03:00
Alexander Alekhin
e1ba4399e8
Merge pull request #6611 from tomoaki0705:fixPerformanceSplitAarch64
2016-06-01 10:34:33 +00:00
Tomoaki Teshima
070e4d754e
let the performance test of split pass on 64bit ARM
...
* loosen the threshold only under aarch64
* fix #6610
2016-05-31 23:57:49 +09:00
Alexander Alekhin
d3930cdee1
Merge pull request #6482 from paroj:filestorage_py
2016-05-31 11:53:34 +00:00
Vadim Pisarevsky
a2d8e7fa6e
Merge pull request #6485 from vagran:vagran-patch-1
2016-05-31 10:58:18 +00:00
Vadim Pisarevsky
7f9319924b
Merge pull request #6537 from Slonegg:opeeni2_multiple_devices
2016-05-31 10:35:44 +00:00
Vadim Pisarevsky
40686415f9
Merge pull request #6593 from bramton:documentation-update
2016-05-31 10:32:18 +00:00
Vadim Pisarevsky
904cfa576c
Merge pull request #6597 from sturkmen72:issue_4678
2016-05-31 10:31:15 +00:00
Alexander Alekhin
ff0601cda5
core: prevent changes in 'std' namespace
2016-05-31 13:02:15 +03:00
Alexander Alekhin
f6fa1cee2b
Merge pull request #6008 from amroamroamro:fix_sparse_snippet
2016-05-31 08:19:38 +00:00
Maksim Shabunin
c344435378
Merge pull request #6602 from berak:patch-1
2016-05-30 14:19:19 +00:00
berak
a2b353d178
Update non_linear_svms.cpp
...
fix for #6598
2016-05-30 06:56:28 +02:00
Suleyman TURKMEN
e59da10bf1
Update highgui.hpp
2016-05-28 05:25:25 +03:00
Bram Ton
dfd5191e8b
Minor additions to the documentation.
2016-05-26 16:35:20 +02:00
Maksim Shabunin
eca752368b
Merge pull request #6592 from guysoft:fix_6500_fix2
2016-05-26 14:15:15 +00:00
Alexander Alekhin
4547427946
Merge pull request #6589 from tomoaki0705:fixThresh64fTest
2016-05-26 12:44:56 +00:00
Guy Sheffer
0a48b9ae77
Fix #6500 cmake bug that adds D_FORCE_INLINES to NVCC
2016-05-26 13:45:50 +03:00
Maksim Shabunin
60f799ada5
Merge pull request #6583 from mshabunin:doc-warnings-fix
2016-05-26 09:54:26 +00:00
Tomoaki Teshima
bbeac745ca
Update test case for 64F version
2016-05-26 08:38:29 +09:00
Maksim Shabunin
cbf2b79e1f
Fixed documentation warnings produced by updated doxygen
2016-05-25 18:04:32 +03:00
Pavel Rojtberg
bf688da50b
FileStorage: add simplified API for bindings
...
at least it is possible to read/ write calibration files. Fixes #4282 .
Also add CPP method for writing comments.
2016-05-25 16:01:55 +02:00
Vadim Pisarevsky
0cb1e96472
Merge pull request #6546 from atinfinity:pullreq/160517-threshold-64F
2016-05-25 13:19:50 +00:00
