Alexander Alekhin
b23527bf02
core: fix arguments types for cblas calls
2016-06-30 20:25:08 +03:00
Alexander Alekhin
5346870920
Merge pull request #6558 from lletourn:master
2016-06-30 13:44:16 +00:00
Alexander Alekhin
639c8fc6d6
Merge pull request #5870 from IshankGulati:VideoCapture-fix
2016-06-30 13:20:51 +00:00
Alexander Alekhin
b7735b3400
Merge pull request #6731 from jokereactive:viz_sample
2016-06-30 12:41:52 +00:00
Maksim Shabunin
4aa9b230b8
Merge pull request #6603 from debjan:patch-1
2016-06-30 11:35:22 +00:00
Alexander Alekhin
e98c1bfb53
Merge pull request #6747 from ludv1x:master
2016-06-30 08:02:19 +00:00
Vitaliy Lyudvichenko
930d96f684
Fixing of AutoBuffer::allocate(nsz) method
...
AutoBuffer::allocate(nsz) didn't work properly when
(sz < nsz < fixed_size). In this case sz remained unchanged.
2016-06-29 19:50:51 +03:00
Alexander Alekhin
69bd6dad1f
Merge pull request #6029 from sturkmen72:patch-7
2016-06-29 11:55:09 +00:00
Alexander Alekhin
cb48183d02
Merge pull request #6711 from Dubrzr:vs_compile_cuda_fix
2016-06-29 11:03:47 +00:00
Alexander Alekhin
c7fc9dc42f
Merge pull request #6707 from tech2077:master
2016-06-29 11:00:49 +00:00
Alexander Alekhin
bbc327aaed
Merge pull request #6736 from alalek:cmake_fix_install_path
2016-06-28 16:53:45 +00:00
Alexander Alekhin
c5a8619493
cmake: fix install path
...
CMake doesn't work with empty paths ("") or paths which contains "./"
2016-06-28 13:29:00 +03:00
Alexander Alekhin
02edfc8df2
Merge pull request #6730 from sturkmen72:patch-16
2016-06-28 05:36:15 +00:00
Alexander Alekhin
6b511751f5
Merge pull request #6619 from Slonegg:openni2_ir_stream
2016-06-28 05:21:25 +00:00
Dmitry Trifonov
f9e6741807
added support for OpenNI2 IR stream #4366
2016-06-27 10:04:59 -07:00
Alexander Alekhin
86b54a52f0
Merge pull request #6733 from simonhaenisch:simonhaenisch-improve-watershed.py-example
2016-06-27 16:44:24 +00:00
Simon Hänisch
6489d8a96f
update watershed.py: check if windows are still open
...
change the `while` loop to check if the two windows created by this example still exist, stop the program otherwise
2016-06-27 17:03:37 +02:00
Suleyman TURKMEN
e7ec580318
Update imgcodecs.hpp
2016-06-27 16:38:47 +03:00
sarthak
43dca117b9
opencv viz bug
...
removed binary
update
2016-06-27 14:12:55 +05:30
Suleyman TURKMEN
11ca1c95f8
update cpp samples and tutorials
2016-06-26 20:55:00 +03:00
Suleyman TURKMEN
1b22783d46
Update grfmt_png.cpp
2016-06-26 20:03:03 +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
Matthew Skolaut
f861d0d643
merge #ifs in highgui bindings
2016-06-21 17:16:16 -05:00
Alexander Alekhin
a76fd43599
Merge pull request #6709 from alalek:cmake_hal_fix
2016-06-21 19:27:02 +00:00
Julien Dubiel
33ab236ed3
Use CMAKE_LIBRARY_PATH_FLAG variable instead of -L.
2016-06-21 20:00:50 +02: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
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
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
