Vladislav Sovrasov
14451f3f06
core: fix adjustROI behavior on indexes overflow
2017-02-22 14:05:51 +03:00
Wenju He
9fbce6c8c8
fix multiband_blend.cu build error in issue opencv_contrib#1012
2017-02-22 08:44:10 +08:00
ionut
a41d877fe6
Change the value of bit/pixel from channels to 8*channels because videos encoded
...
by cap_mjpeg_encoder.cpp don't play on windows media player.
Issue number #8113
2017-02-21 19:15:40 +02:00
Alexander Alekhin
88a338a3eb
cmake: disable pkg-config for Apple frameworks
2017-02-21 19:23:37 +03:00
berak
d7240d1a28
fix leaking handle in cap_dshow.cpp
2017-02-21 14:27:12 +01:00
Vitaly Tuzov
9a4b5a4545
OpenVX calls updated to use single common OpenVX context per thread
2017-02-21 16:08:23 +03:00
Alexander Alekhin
ec7f74f7b4
core(TLS): add cleanup() method
2017-02-21 16:08:23 +03:00
Alexander Alekhin
eaba0e6358
cmake: append '-framework UIKit' for videoio/imgcodecs module
2017-02-21 13:37:37 +03:00
Alexander Alekhin
f1c8e04268
ios framework: don't disable opencv_world in dynamic framework
2017-02-21 13:37:37 +03:00
Alexander Alekhin
a78d143c98
ios framework: refactor code (no functional changes)
2017-02-21 13:37:37 +03:00
Pavel Rojtberg
789dc0a3b7
python: type of initial_button_state must match format string
2017-02-21 11:11:22 +01:00
Fangjun KUANG
526220a171
Fix typos in the documentation ( #8226 )
...
* fix typos.
* Fix typos.
* Fix typos.
* Fix typos.
* Fix typos.
2017-02-21 12:48:15 +03:00
Vadim Pisarevsky
5bfaf9931b
Merge pull request #8228 from csukuangfj:csukuangfj-patch
2017-02-21 09:46:09 +00:00
Vadim Pisarevsky
007354ebaf
Merge pull request #8233 from Sahloul:features/python_matx
2017-02-21 09:43:26 +00:00
Hamdi Sahloul
232d6b87f4
cv::Matx python wrapper
2017-02-21 11:29:28 +09:00
Fangjun KUANG
b1851e2f16
Add support to print cv::UMat
.
...
Now a user can use `std::cout` to print an object of `cv::UMat` just like `cv::Mat`.
2017-02-20 16:22:46 +01:00
Tomoaki Teshima
64cf206fb5
optimize blend using universal intrinsic
...
- add more channels/depth performance test for blend
2017-02-20 19:09:26 +09:00
Alexander Alekhin
b2da9df82d
Merge pull request #8221 from csukuangfj:csukuangfj-path-2
2017-02-19 10:16:00 +00:00
LaurentBerger
8638bba670
Merge pull request #8220 from LaurentBerger:Issue5035
2017-02-19 13:15:58 +03:00
Fangjun KUANG
e827a5bd9e
Fix an error in the demo code for cv::Mat::forEach
2017-02-18 10:14:29 +01:00
Vadim Pisarevsky
9053839282
Merge pull request #8178 from tomoaki0705:addBayer2RGBA
2017-02-16 15:01:49 +00:00
Vadim Pisarevsky
3240f2a6b7
Merge pull request #8187 from hewj03:improve-MultiBandBlender-cuda
2017-02-16 15:00:58 +00:00
Fangjun KUANG
57ed0e57f0
Fix the documentation for Mat::diag(int). ( #8199 )
...
* Fix the documentation for Mat::diag(int).
Fix issue #8181
* Fix the documentation for Mat::diag(int).
Fix issue #8181 .
* Add support for printing out cv::Complex.
* Remove extra spaces.
* cv::Complex is submitted as a new pull request.
2017-02-16 18:00:32 +03:00
Vadim Pisarevsky
ca0b6fbb95
Merge pull request #8203 from alalek:ocl_kernelarg_validate
2017-02-16 14:58:25 +00:00
Alexander Alekhin
0af3638c5a
Merge pull request #8214 from jinay1991:patch-1
2017-02-16 11:09:00 +00:00
Jinay Patel
f710d96602
Update ocl.cpp function Device::OpenCLVersion()
...
Instead of CL_DEVICE_EXTENSIONS in Querying OpenCLVersion, it should be CL_DEVICE_VERSION flag which needs to be passed to the function.
2017-02-16 15:20:57 +05:30
Alexander Alekhin
bc8a91ed83
Merge pull request #8211 from csukuangfj:csukuangfj-patch-3
2017-02-16 08:57:44 +00:00
Alexander Alekhin
bb8be523c5
Merge pull request #8210 from alalek:fix_mkl_link
2017-02-16 08:56:02 +00:00
Vadim Pisarevsky
236815ec40
Merge pull request #8131 from atinfinity:170205-add_dense_flow_sample
2017-02-15 20:22:57 +00:00
Vadim Pisarevsky
e720427b53
Merge pull request #8153 from Sejsel:patch-1
2017-02-15 20:17:39 +00:00
Fangjun KUANG
a8a208e0fe
Merge pull request #8208 from csukuangfj:complex_support
...
Add support for printing out cv::Complex. (#8208 )
* Add support for printing out cv::Complex.
* Conform to the format of std::complex.
* Remove extra spaces.
* Remove extra spaces.
2017-02-15 21:50:14 +03:00
Alexander Alekhin
3fbaabc866
Merge pull request #8209 from csukuangfj:csukuangfj-patch-2
2017-02-15 18:48:01 +00:00
Fangjun KUANG
5e4dfb9546
Change the argument type to cl_platform_info.
...
Although both `cl_platform_info` and `cl_device_info` are defined as macro `cl_uint`, it needs to use `cl_platform_info` to get
the platform information.
2017-02-15 16:44:40 +01:00
Alexander Alekhin
13b0fd993c
Merge pull request #8206 from paroj:cast
2017-02-15 15:35:17 +00:00
Alexander Alekhin
05248a3dea
cmake: fix order of MKL libraries, don't pass additional libraries as modules
2017-02-15 17:13:13 +03:00
Fangjun KUANG
46fe74177d
Fix typos.
2017-02-15 14:52:00 +01:00
Pavel Rojtberg
df86f0752a
add missing casts to _Tp as determinant() always returns double
2017-02-15 12:21:17 +01:00
Alexander Alekhin
4c7aa8645a
ocl: validate arguments in KernelArgs constructor
...
- don't use undefined flag=0. It should be CONSTANT instead.
- don't allow 'UMat* m=NULL' argument (except LOCAL/CONSTANT flags).
This case is not handled well to provide NULL __global pointers.
It is better to use '-D' macro defines instead (at least for performance)
2017-02-14 16:10:32 +03:00
Alexander Alekhin
1304ad1e12
Merge pull request #8160 from ilijapuaca:master
2017-02-14 13:03:09 +00:00
Alexander Alekhin
e16227b53c
cmake: support multiple CPU targets
2017-02-13 19:52:59 +03:00
Alexander Alekhin
47ae5f14f5
Merge pull request #8186 from Kronopath:patch-1
2017-02-13 10:59:59 +00:00
Alexander Alekhin
156d736e75
Merge pull request #8176 from alalek:cmake_cleanup_msvc_checks
2017-02-13 10:59:31 +00:00
Alexander Alekhin
b7945827f9
Merge pull request #8175 from alalek:cmake_cleanup_defines
2017-02-13 10:59:09 +00:00
Fangjun KUANG
1e11657ba4
Merge pull request #8197 from csukuangfj/csukuangfj-patch-1
...
Fix typos in the documentation for AutoBuffer. (#8197 )
* Allocate 1000 floats to match the documentation
Fix the documentation of `AutoBuffer`. By default, the following code
```.cpp
cv::AutoBuffer<float> m;
````
allocates only 264 floats. But the comment in the demonstration code says it allocates 1000 floats, which is
not correct.
* fix typo in the comment.
2017-02-13 13:58:44 +03:00
atinfinity
ca5e0f53b8
refactoring
2017-02-13 00:53:35 +09:00
atinfinity
bbe0f2cef5
refactoring
2017-02-13 00:35:52 +09:00
atinfinity
c2a880d7c9
fixed indent
2017-02-13 00:26:48 +09:00
atinfinity
9552206a4c
added option to specify flow type
2017-02-12 23:33:57 +09:00
Wenju He
2722133206
add accuracy test CUDA_MultiBandBlender
2017-02-12 17:16:49 +08:00
Wenju He
b76e88354c
improve MultiBandBlender cuda, add normalizeUsingWeight and addSrcWeight kernels
2017-02-12 17:08:05 +08:00