Alexandr Kondratev
fd78e2cc6c
highgui module: removed unused type_mouse_event mouse_wheel
2016-06-25 00:47:22 +03:00
Alexandr Kondratev
3cbd14d61a
pull highgui mouse wheel changes linux into master
2016-06-25 00:42:47 +03:00
Alexandr Kondratev
6020dacc11
highgui module: implemented QT and GTK mouse wheel callback support in linux
2016-06-25 00:18:07 +03:00
Alexander Alekhin
0e436c3fe9
Merge pull request #6721 from alalek:tbb_update
2016-06-24 12:54:55 +00:00
Vitaly Tuzov
eaec95dcf2
Update TBB
2016-06-23 11:48:48 +03:00
Alexander Alekhin
0ebe387cb2
Merge pull request #6713 from alalek:cmake_install_fix
2016-06-22 20:35:15 +00:00
Alexander Alekhin
f0dc7a25e7
Merge pull request #6712 from alalek:cmake_export_fix
2016-06-22 20:34:46 +00:00
Alexander Alekhin
f57e3ce5f3
cmake: don't use absolute paths with/without CMAKE_INSTALL_PREFIX
...
CPack can't work with absolute paths.
2016-06-22 16:38:54 +03:00
Alexander Alekhin
09ce987552
cmake: fix export issue
...
opencv_ts is static internal library and in case of exporting
it requires all static dependencies (include HAL files)
2016-06-22 15:34:46 +03:00
Alexander Alekhin
a76fd43599
Merge pull request #6709 from alalek:cmake_hal_fix
2016-06-21 19:27:02 +00:00
Alexander Alekhin
09c2a8b7ad
cmake: fix HAL dependencies for core module
...
Linker dependencies are transitive for non-private
2016-06-21 19:50:32 +03:00
Alexander Alekhin
be38a524a8
Merge pull request #6705 from alalek:fix_hal_imgproc
2016-06-21 16:24:29 +00:00
Alexander Alekhin
61492ea0dc
Merge pull request #6708 from alalek:pr6477
2016-06-21 15:38:41 +00:00
Alexander Alekhin
96937bac74
Merge pull request #6581 from mshabunin:hal_mag
2016-06-21 13:16:17 +00:00
Alexander Alekhin
89cd74093e
Merge pull request #6704 from alalek:cmake_cmp0042
2016-06-21 10:46:08 +00:00
Alexander Alekhin
2fb670cf09
hal: fix missing include "opencv2/imgproc/hal/interface.h"
2016-06-20 19:25:49 +03:00
Alexander Alekhin
f5306a0740
cmake: change CMP0042 policy value
2016-06-20 18:28:12 +03: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
