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:30:09 +0000 (09:30 +0000)]
Merge pull request #8525 from nnorwitz:master
Alexander Alekhin [Tue, 11 Apr 2017 09:20:14 +0000 (09:20 +0000)]
Merge pull request #8555 from tomoaki0705:jetsontx2
Tomoaki Teshima [Mon, 10 Apr 2017 13:19:17 +0000 (22:19 +0900)]
build with cc 6.2 on Jetson TX2
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
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
Vitaly Tuzov [Thu, 23 Mar 2017 17:23:56 +0000 (20:23 +0300)]
Restricted OpenVX HAL separable filter implementation to 3x3 kernel size
Alexander Alekhin [Thu, 23 Mar 2017 15:12:48 +0000 (18:12 +0300)]
cmake: fix try_compile() with --coverage flags
Alexander Alekhin [Thu, 23 Mar 2017 13:09:47 +0000 (16:09 +0300)]
core(mathfuncs_core): cpu optimization dispatched code
Alexander Alekhin [Wed, 22 Mar 2017 11:46:34 +0000 (14:46 +0300)]
core: CPU target dispatcher update
- use suffixes like '.avx.cpp'
- added CMake-generated files for '.simd.hpp' optimization approach
- wrap HAL intrinsic headers into separate namespaces for different build flags
- automatic vzeroupper insertion (via CV_INSTRUMENT_REGION macro)
Julian Tanke [Thu, 23 Mar 2017 13:00:19 +0000 (14:00 +0100)]
export SVM::trainAuto to python #7224 (#8373)
* export SVM::trainAuto to python #7224
* workaround for ABI compatibility of SVM::trainAuto
* add parameter comments to new SVM::trainAuto function
* Export ParamGrid member variables
Vadim Pisarevsky [Thu, 23 Mar 2017 12:51:43 +0000 (12:51 +0000)]
Merge pull request #8430 from sovrasov:interactive_calib_can_drop_aruco
Alexander Alekhin [Thu, 23 Mar 2017 12:49:27 +0000 (12:49 +0000)]
Merge pull request #8439 from egorpugin:patch-1
Vadim Pisarevsky [Thu, 23 Mar 2017 12:47:54 +0000 (12:47 +0000)]
Merge pull request #8437 from matrush:master
Egor Pugin [Thu, 23 Mar 2017 11:42:23 +0000 (14:42 +0300)]
Fix build under directories with '.cpp' string.
Chaoshuai Lu [Thu, 23 Mar 2017 05:20:42 +0000 (22:20 -0700)]
Fix UIImageToMat method by taking image scale information into account
Chaoshuai Lu [Thu, 23 Mar 2017 05:04:27 +0000 (22:04 -0700)]
Fix MatToUIImage method crash when the step is not equal to cols * elemSize()
KUANG, Fangjun [Wed, 22 Mar 2017 21:24:20 +0000 (22:24 +0100)]
fix issue 8189.
Alexander Alekhin [Wed, 22 Mar 2017 15:23:34 +0000 (15:23 +0000)]
Merge pull request #8423 from terfendail:vt_ivx_enumupdate
Vadim Pisarevsky [Wed, 22 Mar 2017 14:13:13 +0000 (14:13 +0000)]
Merge pull request #8364 from csukuangfj:patch-2
Vitaly Tuzov [Tue, 14 Mar 2017 12:24:21 +0000 (15:24 +0300)]
Updated OpenVX detector and wrappers to handle Reference attribute names change
Vladislav Sovrasov [Wed, 22 Mar 2017 13:08:25 +0000 (16:08 +0300)]
Make aruco dependency optional for interactive calibration app
Alexander Alekhin [Wed, 22 Mar 2017 10:45:24 +0000 (13:45 +0300)]
Merge branch 'pr8392'
Vadim Pisarevsky [Tue, 21 Mar 2017 20:06:56 +0000 (20:06 +0000)]
Merge pull request #8404 from khnaba:stream-with-custom-allocator
Vadim Pisarevsky [Tue, 21 Mar 2017 20:05:54 +0000 (20:05 +0000)]
Merge pull request #8406 from khnaba:dft-as-algorithm
Vadim Pisarevsky [Tue, 21 Mar 2017 19:51:32 +0000 (19:51 +0000)]
Merge pull request #7462 from alalek:cpu_multi_target
Naba Kumar [Wed, 15 Mar 2017 06:40:08 +0000 (08:40 +0200)]
Support for creating streams with custom allocator
Alexander Alekhin [Tue, 21 Mar 2017 12:43:15 +0000 (12:43 +0000)]
Merge pull request #8424 from khnaba:expose-buffer-pool
Alexander Alekhin [Tue, 21 Mar 2017 11:59:56 +0000 (11:59 +0000)]
Merge pull request #8401 from avartenkov:multichannel_warp
Alexander Alekhin [Tue, 21 Mar 2017 11:57:57 +0000 (11:57 +0000)]
Merge pull request #8416 from berak:patch-2
Naba Kumar [Wed, 15 Mar 2017 06:41:54 +0000 (08:41 +0200)]
Implement DFT as cv::Algorithm to support concurrent streams
Naba Kumar [Wed, 15 Mar 2017 13:22:32 +0000 (15:22 +0200)]
Expose BufferPool class for external use also
Alexander Alekhin [Tue, 21 Mar 2017 10:44:52 +0000 (10:44 +0000)]
Merge pull request #8393 from alalek:ocl_driver_version
Alexander Alekhin [Tue, 21 Mar 2017 09:06:30 +0000 (09:06 +0000)]
Merge pull request #8422 from berak:fix_shapematchmodes
vartenkov [Thu, 16 Mar 2017 15:50:29 +0000 (18:50 +0300)]
Fix multichannel warping with BORDER_CONSTANT
Warping a matrix with more than 4 channels using BORDER_CONSTANT and
INTER_NEAREST, INTER_CUBIC or INTER_LANCZOS4 interpolation led to
undefined behaviour. This commit changes the behavior of these methods
to be similar to that of INTER_LINEAR. Changed the scope of some of the
variables to more local. Modified some tests to be able to detect the
error described.
berak [Mon, 20 Mar 2017 08:59:19 +0000 (09:59 +0100)]
imgproc: move ShapeMatchModes enum from c to c++ header
berak [Sun, 19 Mar 2017 09:12:50 +0000 (10:12 +0100)]
remove unnessecary print statement
#resolves: 7881
remove printf statement and associated variables from invMapPointSpherical() in undistort.cpp
Alexander Alekhin [Wed, 15 Mar 2017 17:27:18 +0000 (17:27 +0000)]
Merge pull request #8376 from mshabunin:reduce-dependencies
Alexander Alekhin [Wed, 15 Mar 2017 15:23:30 +0000 (18:23 +0300)]
ocl: dump OpenCL driver version in tests
Maksim Shabunin [Mon, 13 Mar 2017 15:53:52 +0000 (18:53 +0300)]
Reduce dependencies between modules