Arnaud Brejeon [Wed, 19 Apr 2017 10:13:39 +0000 (03:13 -0700)]
Merge pull request #8535 from arnaudbrejeon:std_array
Add support for std::array<T, N> (#8535)
* Add support for std::array<T, N>
* Add std::array<Mat, N> support
* Remove UMat constructor with std::array parameter
insoow [Wed, 19 Apr 2017 09:57:54 +0000 (02:57 -0700)]
Merge pull request #8104 from insoow:master
Gemm kernels for Intel GPU (#8104)
* Fix an issue with Kernel object reset release when consecutive Kernel::run calls
Kernel::run launch OCL gpu kernels and set a event callback function
to decreate the ref count of UMat or remove UMat when the lauched workloads
are completed. However, for some OCL kernels requires multiple call of
Kernel::run function with some kernel parameter changes (e.g., input
and output buffer offset) to get the final computation result.
In the case, the current implementation requires unnecessary
synchronization and cleanupMat.
This fix requires the user to specify whether there will be more work or not.
If there is no remaining computation, the Kernel::run will reset the
kernel object
Signed-off-by: Woo, Insoo <insoo.woo@intel.com>
* GEMM kernel optimization for Intel GEN
The optimized kernels uses cl_intel_subgroups extension for better
performance.
Note: This optimized kernels will be part of ISAAC in a code generation
way under MIT license.
Signed-off-by: Woo, Insoo <insoo.woo@intel.com>
* Fix API compatibility error
This patch fixes a OCV API compatibility error. The error was reported
due to the interface changes of Kernel::run. To resolve the issue,
An overloaded function of Kernel::run is added. It take a flag indicating
whether there are more work to be done with the kernel object without
releasing resources related to it.
Signed-off-by: Woo, Insoo <insoo.woo@intel.com>
* Renaming intel_gpu_gemm.cpp to intel_gpu_gemm.inl.hpp
Signed-off-by: Woo, Insoo <insoo.woo@intel.com>
* Revert "Fix API compatibility error"
This reverts commit
2ef427db91b6c4aec170f691c5d2e6c47d6520d7.
Conflicts:
modules/core/src/intel_gpu_gemm.inl.hpp
* Revert "Fix an issue with Kernel object reset release when consecutive Kernel::run calls"
This reverts commit
cc7f9f54695dc293598addce9b9d7e345225bede.
* Fix the case of uninitialization D
When C is null and beta is non-zero, D is used without initialization.
This resloves the issue
Signed-off-by: Woo, Insoo <insoo.woo@intel.com>
* fix potential output error due to 0 * nan
Signed-off-by: Woo, Insoo <insoo.woo@intel.com>
* whitespace fix, eliminate non-ASCII symbols
* fix build warning
Alexander Alekhin [Tue, 18 Apr 2017 12:22:57 +0000 (12:22 +0000)]
Merge pull request #8600 from tomoaki0705:fixErrorOdroidX2
Tomoaki Teshima [Tue, 18 Apr 2017 10:31:57 +0000 (19:31 +0900)]
fix build error on ODROID-X2
Alexander Alekhin [Tue, 18 Apr 2017 08:08:55 +0000 (08:08 +0000)]
Merge pull request #8590 from berak:patch-2
Alexander Alekhin [Mon, 17 Apr 2017 14:20:25 +0000 (14:20 +0000)]
Merge pull request #8589 from tomoaki0705:fixTypoCalib3d
Alexander Alekhin [Mon, 17 Apr 2017 08:08:34 +0000 (08:08 +0000)]
Merge pull request #8565 from iglesias:fix/bgsknn-initialization
berak [Mon, 17 Apr 2017 07:10:10 +0000 (09:10 +0200)]
Update tvl1_optical_flow.cpp
repair broken cmdline param for cpu/gpu mode
Tomoaki Teshima [Sun, 16 Apr 2017 23:32:08 +0000 (08:32 +0900)]
fix typo and align white spaces
Alexander Alekhin [Fri, 14 Apr 2017 20:12:19 +0000 (20:12 +0000)]
Merge pull request #8581 from ysolovyov:zlib-ios-fix
brian-armstrong-discord [Fri, 14 Apr 2017 20:12:07 +0000 (13:12 -0700)]
Merge pull request #8492 from brian-armstrong-discord:exif_inmemory
autorotate in-memory jpegs (#8492)
* autorotate in-memory jpegs
* correct indentation (4 spaces)
* imgcodecs: don't apply EXIF rotation for unloaded images
* videoio: don't try to rotate MJPEG stream
* imgcodecs: ByteStreamBuffer::seekoff support all seek "dir"
* imgcodecs: fix condition: "off == egptr() - eback()" is valid offset
Yuriy Solovyov [Fri, 14 Apr 2017 14:16:00 +0000 (17:16 +0300)]
Fix zlib issue on iOS
Alexander Alekhin [Fri, 14 Apr 2017 11:40:07 +0000 (11:40 +0000)]
Merge pull request #8522 from zongwave:master
Alexander Alekhin [Fri, 14 Apr 2017 11:04:58 +0000 (11:04 +0000)]
Merge pull request #8576 from terfendail:ovx_fixwrappers
zongwave [Wed, 21 Dec 2016 08:12:08 +0000 (16:12 +0800)]
Add method KeypointBasedMotionEstimator::estimate(InputArray, InputArray) to support both cpu & opencl algorithm processing
the orignal estimate function has input parameters defined as "Mat", this prevent users to call into algorithm opencl path
Vitaly Tuzov [Thu, 13 Apr 2017 14:45:42 +0000 (17:45 +0300)]
Fixed size estimation for copyFrom/To vector in vx_matrix and vx_convolution wrappers
Alexander Alekhin [Wed, 12 Apr 2017 19:23:41 +0000 (19:23 +0000)]
Merge pull request #8571 from alalek:cmake_fix_optimization_filter
Alexander Alekhin [Wed, 12 Apr 2017 16:04:16 +0000 (16:04 +0000)]
Merge pull request #8508 from vskarlsruhe:patch-5
Alexander Alekhin [Wed, 12 Apr 2017 15:27:20 +0000 (18:27 +0300)]
cmake: fix optimization filter
Check file name only:
Excluding from source files list (optimization is disabled):
C:/Code/SrcExt/OpenCV/Buildv3.2_x64/modules/core/opencl_kernels_core.cpp
Alexander Alekhin [Wed, 12 Apr 2017 13:46:09 +0000 (13:46 +0000)]
Merge pull request #8567 from tomoaki0705:fixCbrtVS2012
Tomoaki Teshima [Wed, 12 Apr 2017 11:09:00 +0000 (20:09 +0900)]
fix build error on VS2012
Alexander Alekhin [Wed, 12 Apr 2017 08:52:08 +0000 (08:52 +0000)]
Merge pull request #8564 from orisano:patch-1
Alexander Alekhin [Wed, 12 Apr 2017 08:39:09 +0000 (08:39 +0000)]
Merge pull request #8559 from liquidmetal:feature/utsinh_allocate_ecc
orisano [Wed, 12 Apr 2017 03:18:51 +0000 (12:18 +0900)]
Remove stdout log when destructor called.
Fernando Iglesias Garcia [Wed, 12 Apr 2017 08:11:50 +0000 (10:11 +0200)]
Initialize background model in background subtraction KNN.
The method does cvCheckPixelBackgroundNP (which reads bgmodel)
before it is ever updated (in cvUpdatePixelBackgroundNP). This
initialization is thus needed to avoid reads of unitialized values.
Utkarsh Sinha [Tue, 11 Apr 2017 13:42:20 +0000 (06:42 -0700)]
Updating documentation.
Alexander Alekhin [Tue, 11 Apr 2017 13:25:36 +0000 (13:25 +0000)]
Merge pull request #8561 from alalek:fix_ffmpeg_check
Alexander Alekhin [Tue, 11 Apr 2017 11:46:06 +0000 (11:46 +0000)]
Merge pull request #8548 from csukuangfj:fix-typo-RNG
Alexander Alekhin [Tue, 11 Apr 2017 10:36:01 +0000 (10:36 +0000)]
Merge pull request #8540 from tomoaki0705:fixWaringPhoto
Alexander Alekhin [Tue, 11 Apr 2017 10:06:34 +0000 (10:06 +0000)]
Merge pull request #8458 from grundman:patch-2
Alexander Alekhin [Tue, 11 Apr 2017 09:35:48 +0000 (12:35 +0300)]
ffmpeg: add __STDC_CONSTANT_MACROS to check code
Alexander Alekhin [Tue, 11 Apr 2017 09:30:09 +0000 (09:30 +0000)]
Merge pull request #8525 from nnorwitz:master
Tomoaki Teshima [Fri, 7 Apr 2017 10:11:05 +0000 (19:11 +0900)]
suppress warning on Jetson TK1
Alexander Alekhin [Tue, 11 Apr 2017 09:20:14 +0000 (09:20 +0000)]
Merge pull request #8555 from tomoaki0705:jetsontx2
Utkarsh Sinha [Tue, 11 Apr 2017 03:43:33 +0000 (20:43 -0700)]
If the user passes an empty output matrix, initialize it to identity.
Tomoaki Teshima [Mon, 10 Apr 2017 13:19:17 +0000 (22:19 +0900)]
build with cc 6.2 on Jetson TX2
Fangjun KUANG [Mon, 10 Apr 2017 07:32:50 +0000 (09:32 +0200)]
fix typos.
Tong Ke [Fri, 7 Apr 2017 06:48:34 +0000 (01:48 -0500)]
Merge pull request #8301 from tonyke1993:p3p_alg
New p3p algorithm (accepted by CVPR 2017) (#8301)
* add p3p source code
* indent 4
* update publication info
* fix filename
* interface done
* plug in done, test needed
* debugging
* for test
* a working version
* clean p3p code
* test
* test
* fix warning, blank line
* apply patch from @catree
* add reference info
* namespace, indent 4
* static solveQuartic
* put small functions to anonymous namespace
Alexander Alekhin [Thu, 6 Apr 2017 20:49:33 +0000 (20:49 +0000)]
Merge pull request #8524 from mshabunin:java-fixes
nnorwitz [Thu, 6 Apr 2017 19:54:56 +0000 (12:54 -0700)]
Use %% for inline assembly rather than % so this compiles with clang.
Same as https://github.com/opencv/opencv/pull/8525/commits/
9210cefb36868e201f7e0c8b84e4ee4f91b5432b but for this file too.
nnorwitz [Wed, 5 Apr 2017 17:57:50 +0000 (10:57 -0700)]
Use %% for inline assembly rather than % so this compiles with clang.
Maksim Shabunin [Wed, 5 Apr 2017 14:50:46 +0000 (17:50 +0300)]
Added javadoc generation
Maksim Shabunin [Wed, 5 Apr 2017 11:10:03 +0000 (14:10 +0300)]
Fixed Algorithm.save and other methods work in Java
Alexander Alekhin [Wed, 5 Apr 2017 10:02:01 +0000 (10:02 +0000)]
Merge pull request #8523 from mshabunin:fix-cvtcolor-ocl
Maksim Shabunin [Wed, 5 Apr 2017 08:48:29 +0000 (11:48 +0300)]
Fixed cvtColor OCL compilation issue (BGRA2mBGRA)
Alexander Alekhin [Wed, 5 Apr 2017 06:34:45 +0000 (06:34 +0000)]
Merge pull request #8520 from tomoaki0705:cudaWarningsSuppress
Tomoaki Teshima [Tue, 4 Apr 2017 23:30:16 +0000 (08:30 +0900)]
suppress warnings from cuda
Alexander Alekhin [Tue, 4 Apr 2017 20:06:59 +0000 (20:06 +0000)]
Merge pull request #8518 from alalek:fix_fp16
Alexander Alekhin [Tue, 4 Apr 2017 17:41:02 +0000 (17:41 +0000)]
Merge pull request #8517 from alalek:fix_build_pch
Alexander Alekhin [Tue, 4 Apr 2017 17:34:58 +0000 (20:34 +0300)]
cmake: fix fp16 support
Alexander Alekhin [Tue, 4 Apr 2017 16:48:16 +0000 (19:48 +0300)]
cmake: fix GCC precompiled headers warnings
Alexander Alekhin [Tue, 4 Apr 2017 15:01:21 +0000 (15:01 +0000)]
Merge pull request #8514 from paroj:v4lretval
Pavel Rojtberg [Tue, 4 Apr 2017 13:07:02 +0000 (15:07 +0200)]
cap_v4l: SetProperty - do not return false while setting video size
Alexander Alekhin [Mon, 3 Apr 2017 20:55:50 +0000 (20:55 +0000)]
Merge pull request #8496 from Sahloul:fixes/wrappers/imgproc/EMD
Alexander Alekhin [Mon, 3 Apr 2017 14:03:48 +0000 (14:03 +0000)]
Merge pull request #8441 from alalek:dispatch_mathfuncs_core
vskarlsruhe [Mon, 3 Apr 2017 09:58:22 +0000 (11:58 +0200)]
Update py_setup_in_windows.markdown
updated links for python, numpy and matplotlib
Vadim Pisarevsky [Mon, 3 Apr 2017 09:58:21 +0000 (09:58 +0000)]
Merge pull request #8465 from claudiofantacci:enh/cudastreamhog
Vadim Pisarevsky [Mon, 3 Apr 2017 09:57:58 +0000 (09:57 +0000)]
Merge pull request #8484 from berak:patch-2
Vadim Pisarevsky [Mon, 3 Apr 2017 09:57:34 +0000 (09:57 +0000)]
Merge pull request #8504 from bcr3ative:fixStereoBMROI
Vadim Pisarevsky [Mon, 3 Apr 2017 09:34:53 +0000 (09:34 +0000)]
Merge pull request #8342 from grundman:patch-1
Vadim Pisarevsky [Mon, 3 Apr 2017 09:34:18 +0000 (09:34 +0000)]
Merge pull request #8499 from mszu:patch-1
Vadim Pisarevsky [Mon, 3 Apr 2017 09:32:38 +0000 (09:32 +0000)]
Merge pull request #8466 from sxldvd:master
Alexander Alekhin [Sun, 2 Apr 2017 10:17:06 +0000 (10:17 +0000)]
Merge pull request #8495 from sergiud:standalone-dynamic-ipp-detection
Alexander Alekhin [Sun, 2 Apr 2017 10:15:47 +0000 (10:15 +0000)]
Merge pull request #8502 from tomoaki0705:fixWarningsArrayBound
Alexander Alekhin [Sun, 2 Apr 2017 10:13:17 +0000 (10:13 +0000)]
Merge pull request #8506 from sergiud:mat-move-assignment-dont-copy
Sergiu Deitsch [Sat, 1 Apr 2017 19:53:30 +0000 (21:53 +0200)]
prevent copying in cv::Mat_<T> move assignment
Alexander Alekhin [Sat, 1 Apr 2017 14:18:42 +0000 (14:18 +0000)]
Merge pull request #8500 from Sahloul:fixes/wrappers/ptr
Tomoaki Teshima [Sat, 1 Apr 2017 11:53:50 +0000 (20:53 +0900)]
suppress warnings on GCC 4.9 series
- check boundary strictly
- initialize the variable before using it
Paolo Perkovic [Sat, 1 Apr 2017 11:29:44 +0000 (13:29 +0200)]
Fix StereoBM ROI selection
- Fix StereoBM ROI (Region of interest) selection for stereo
images used by block matching algorithm
Hamdi Sahloul [Sat, 1 Apr 2017 09:25:04 +0000 (18:25 +0900)]
Avoid memory leakage in smart pointers wrapper
Hamdi Sahloul [Sat, 1 Apr 2017 08:20:03 +0000 (17:20 +0900)]
Wraps cv::EMD for Python and Java
Mark Szumowski [Fri, 31 Mar 2017 23:58:07 +0000 (10:58 +1100)]
Update research paper link in Python sample
The docstring for one of the Python sample programs includes a link to the research paper describing the main algorithm. That link is no longer valid (results in a 404 error) so this update replaces it with another link from the same institution which is currently valid.
Alexander Alekhin [Fri, 31 Mar 2017 20:52:45 +0000 (20:52 +0000)]
Merge pull request #8497 from Sahloul:fixes/wrappers/ptr
Hamdi Sahloul [Fri, 31 Mar 2017 18:19:29 +0000 (03:19 +0900)]
Wraps smart pointers properly
Alexander Alekhin [Fri, 31 Mar 2017 15:42:01 +0000 (15:42 +0000)]
Merge pull request #8494 from tomoaki0705:fixWarningCuda
Sergiu Deitsch [Fri, 31 Mar 2017 13:44:38 +0000 (15:44 +0200)]
cmake: fixed standalone dynamic IPP detection under win32
Tomoaki Teshima [Thu, 30 Mar 2017 23:20:59 +0000 (08:20 +0900)]
suppress warnings on Jetson TK1
Alexander Alekhin [Thu, 30 Mar 2017 20:08:14 +0000 (20:08 +0000)]
Merge pull request #8474 from alalek:ocv_download
Alexander Alekhin [Tue, 28 Mar 2017 15:21:13 +0000 (18:21 +0300)]
cmake: update ocv_download
- more aggressive cache for files under CMAKE_BINARY_CACHE
* don't re-read files MD5
* don't repack archives
- add support for ENV{OPENCV_DOWNLOAD_PATH}
- added ID parameter as project/group identifier
- non-flat .cache directory (based on ID)
- download message prefix based on ID
- more detailed logging via ocv_download_log() macro
- force .gitignore file for .cache folder (with '*' pattern)
berak [Thu, 30 Mar 2017 09:07:52 +0000 (11:07 +0200)]
fix comment in optim.hpp
Alexander Alekhin [Tue, 28 Mar 2017 13:08:24 +0000 (13:08 +0000)]
Merge pull request #8470 from superbort:stitching-estimators
Alexander Broemmer [Tue, 28 Mar 2017 12:31:00 +0000 (14:31 +0200)]
Clear old CameraParameters in AffineBasedEstimator
AffineBasedEstimator crashed when called with an existing CameraParameters.
This happens e.g. when using Stitcher in SCANS mode.
CameraraParameters is now cleared before any calculation is executed.
Alexander Alekhin [Tue, 28 Mar 2017 11:13:13 +0000 (11:13 +0000)]
Merge pull request #8421 from mshabunin:download-cache
Matthias Grundmann [Fri, 24 Mar 2017 20:29:04 +0000 (13:29 -0700)]
Update circlesgrid.cpp
Use identity matrix if homography finding failed. Current behavior zeros out all points.
Update circlesgrid.cpp
Addressed comments
Update circlesgrid.cpp
removed whitespace
Sixela David [Mon, 27 Mar 2017 09:15:03 +0000 (11:15 +0200)]
Correcting issue #8431
Claudio [Sat, 25 Mar 2017 14:43:56 +0000 (15:43 +0100)]
Add cuda::streams to by_rows and 8UC1 functions
Fix #8177
Claudio [Sat, 25 Mar 2017 14:12:26 +0000 (15:12 +0100)]
Align parameter code style between hog .cu and .cpp files
Claudio [Fri, 3 Feb 2017 15:00:16 +0000 (16:00 +0100)]
Add cuda::Stream capability to cuda::HOG::compute
In the previous version only the default stream was/could be used, i.e.
cv::cuda::Stream::Null().
With this change, HOG::compute() will now run in parallel over different
cuda::Streams.
The code has been reordered so that all data allocation is completed
first, then all the kernels are run in parallel over streams.
Fix #8177
Alexander Alekhin [Sat, 25 Mar 2017 12:15:54 +0000 (12:15 +0000)]
Merge pull request #8459 from alalek:fix_msvc_static_build
Alexander Alekhin [Fri, 24 Mar 2017 22:28:43 +0000 (01:28 +0300)]
cmake: fix MSVC static builds
Matthias Grundmann [Fri, 24 Mar 2017 20:26:32 +0000 (13:26 -0700)]
Update bgfg_gaussmix2.cpp
Addressed comments.
Alexander Alekhin [Fri, 24 Mar 2017 18:25:30 +0000 (18:25 +0000)]
Merge pull request #8448 from jexner:foreach-segfault-fix
Alexander Alekhin [Fri, 24 Mar 2017 14:38:54 +0000 (14:38 +0000)]
Merge pull request #8454 from superbort:reuse-stitching
Julian Exner [Fri, 24 Mar 2017 13:54:10 +0000 (14:54 +0100)]
Add test case for cv::Mat::forEach
This test case uses a matrix with more dimensions than columns. Without
the fix in
https://github.com/opencv/opencv/pull/8448/commits/
b45e784bebe318826bb48a41023db3fe1660d91e
this crashes with a segmentation fault, hangs or simply fails with wrong
values.
Alexander Broemmer [Thu, 23 Mar 2017 18:16:57 +0000 (19:16 +0100)]
Make stitching panoramas reusable after estimating transform once
Stitcher will now make a working copy of the CameraParams object to avoid side effects when composing Panorama.
Makes it possible to estimate transform once and then compose multiple panoramas. Useful for setup with fixed cameras.
Maksim Shabunin [Wed, 15 Mar 2017 10:19:59 +0000 (13:19 +0300)]
Download cache
Alexander Alekhin [Thu, 23 Mar 2017 20:20:07 +0000 (20:20 +0000)]
Merge pull request #8433 from csukuangfj:issue-8189
Alexander Alekhin [Thu, 23 Mar 2017 20:19:06 +0000 (20:19 +0000)]
Merge pull request #8446 from terfendail:ovxhal_sepfilter3x3
Alexander Alekhin [Thu, 23 Mar 2017 20:12:18 +0000 (20:12 +0000)]
Merge pull request #8443 from alalek:fix_coverage_trycompile
jexner [Thu, 23 Mar 2017 17:48:59 +0000 (18:48 +0100)]
Fix segmentation fault in cv::Mat::forEach
This issue concerns only matrices with more dimensions than columns.
See https://github.com/opencv/opencv/issues/8447