Li Peng [Wed, 31 Jan 2018 18:09:13 +0000 (02:09 +0800)]
fix extra spaces in build option
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Thu, 25 Jan 2018 14:15:41 +0000 (22:15 +0800)]
eltwise layer SUM op update
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Wed, 24 Jan 2018 12:26:16 +0000 (20:26 +0800)]
slice layer ocl support
Signed-off-by: Li Peng <peng.li@intel.com>
Woody Chow [Sat, 27 Jan 2018 05:46:54 +0000 (14:46 +0900)]
Merge pull request #10697 from woodychow:tbb_task_arena
* Use Intel TBB's task arena if possible
Pavel Rojtberg [Fri, 26 Jan 2018 19:05:13 +0000 (20:05 +0100)]
Merge pull request #10667 from paroj:stereo_calib_ex
calib3d: add stereoCalibrateExtended (#10667)
* cvCalibrateCamera2Internal: simplify per view error computation
* calib3d: add stereoCalibrateExtended
- allow CALIB_USE_EXTRINSIC_GUESS
- returns per view errors
* calib3d: add stereoCalibrateExtended test
Alexander Alekhin [Fri, 26 Jan 2018 19:01:48 +0000 (19:01 +0000)]
Merge pull request #10688 from LaurentBerger:calcback
Alexander Alekhin [Fri, 26 Jan 2018 18:59:47 +0000 (21:59 +0300)]
Merge pull request #10700 from alalek:cpu_dispatch_axv512
* cmake: enable CPU dispatching for AVX512 (SKX)
* cmake: update handling of unsupported flags/modes
Alexander Alekhin [Fri, 26 Jan 2018 16:22:38 +0000 (16:22 +0000)]
Merge pull request #10693 from travbid:IntrinsicParams_fix
LaurentBerger [Thu, 25 Jan 2018 11:23:31 +0000 (12:23 +0100)]
solve issue #10687
Alexander Alekhin [Fri, 26 Jan 2018 10:04:41 +0000 (10:04 +0000)]
Merge pull request #10681 from hmaarrfk:python_stitching_scans
Alexander Alekhin [Fri, 26 Jan 2018 04:02:21 +0000 (04:02 +0000)]
Merge pull request #10676 from dkurt:dnn_for_newer_mobilenet_ssd
Travers [Fri, 26 Jan 2018 01:04:45 +0000 (14:04 +1300)]
IntrinsicParams operator+ fix
Maksim Shabunin [Thu, 25 Jan 2018 13:47:47 +0000 (13:47 +0000)]
Merge pull request #10619 from mshabunin:fix-run-py-without-java
Alexander Alekhin [Thu, 25 Jan 2018 10:18:36 +0000 (10:18 +0000)]
Merge pull request #10661 from alalek:parallel_kmeans
Maksim Shabunin [Thu, 25 Jan 2018 09:57:43 +0000 (09:57 +0000)]
Merge pull request #10679 from mshabunin:vs-defense-flags
Alexander Alekhin [Thu, 25 Jan 2018 07:18:25 +0000 (07:18 +0000)]
Merge pull request #10672 from pengli:dnn
Li Peng [Tue, 23 Jan 2018 15:52:41 +0000 (23:52 +0800)]
mvn, batch_norm and relu layer fusion
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Tue, 23 Jan 2018 12:44:28 +0000 (20:44 +0800)]
convolution and tanh layer fusion
Signed-off-by: Li Peng <peng.li@intel.com>
Mark Harfouche [Wed, 24 Jan 2018 20:42:45 +0000 (12:42 -0800)]
Exported a high level stitcher the DLL
allows Stitcher to be used for scans from within python.
I had to use very strange notation because I couldn't export the `enum`
`Mode` making the Cpython generated code unable to compile.
```c++
class Stitcher {
public:
enum Mode
{
PANORAMA = 0,
SCANS = 1,
};
...
```
Also removed duplicate code from the `createStitcher` function making
use of the `Stitcher::create` function
Alexander Alekhin [Wed, 24 Jan 2018 17:49:20 +0000 (17:49 +0000)]
Merge pull request #10675 from LaurentBerger:tutopy_arithm
Alexander Alekhin [Wed, 24 Jan 2018 17:48:11 +0000 (17:48 +0000)]
Merge pull request #10677 from alalek:issue_10668
Maksim Shabunin [Wed, 24 Jan 2018 14:17:36 +0000 (17:17 +0300)]
VS with hardening: added guard flag, moved dynamicbase and safeseh to linker flags
Jozef Mlich [Wed, 24 Jan 2018 14:03:23 +0000 (15:03 +0100)]
Merge pull request #10663 from jmlich:master
* hogsvm compatibility with python3
Alexander Alekhin [Wed, 24 Jan 2018 11:53:04 +0000 (14:53 +0300)]
core(lapack): fix build issues related to 'extern "C"'
Dmitry Kurtaev [Wed, 24 Jan 2018 11:01:42 +0000 (14:01 +0300)]
PriorBox layer with explicit normalized sizes
LaurentBerger [Wed, 24 Jan 2018 08:09:49 +0000 (09:09 +0100)]
bad image file
Elena Gvozdeva [Tue, 23 Jan 2018 22:48:06 +0000 (01:48 +0300)]
add HAL for FAST (#10362)
* add HAL for FAST
* add new interface
Vadim Pisarevsky [Tue, 23 Jan 2018 10:42:05 +0000 (10:42 +0000)]
Merge pull request #10635 from csukuangfj:doc-checkVector
Vadim Pisarevsky [Tue, 23 Jan 2018 10:38:14 +0000 (10:38 +0000)]
Merge pull request #10644 from csukuangfj:doc-fundamental-matrix
Pavel Rojtberg [Tue, 23 Jan 2018 10:36:30 +0000 (11:36 +0100)]
persistence: replace arbitrary limit of cn to 4 by CV_CN_MAX (#10636)
* persistence: replace arbitrary limit of cn to 4 by CV_CN_MAX
* python: added persistence test, remove temp files
* fixup! python: added persistence test, remove temp files
* fixup! python: added persistence test, remove temp files
Alexander Alekhin [Tue, 23 Jan 2018 10:16:55 +0000 (10:16 +0000)]
Merge pull request #10655 from dkurt:dnn_tests
Dmitry Kurtaev [Sat, 20 Jan 2018 18:55:25 +0000 (21:55 +0300)]
OpenCV face detection network test
Alexander Alekhin [Mon, 22 Jan 2018 11:14:02 +0000 (14:14 +0300)]
core: kmeans refactoring
- reduce scope of i,k,j variables
- use cv::AutoBuffer
- template<bool onlyDistance> class KMeansDistanceComputer
- eliminate manual unrolling: CV_ENABLE_UNROLLED
Alexander Alekhin [Wed, 17 Jan 2018 14:39:23 +0000 (17:39 +0300)]
core: fix kmeans multi-threaded performance
Alexander Alekhin [Thu, 18 Jan 2018 15:11:30 +0000 (18:11 +0300)]
core(perf): refactor kmeans test
- don't use RNG for "task size" parameters (N, K, dims)
- add "good" kmeans test data (without singularities: K > unique points)
Vitaly Tuzov [Mon, 22 Jan 2018 10:26:32 +0000 (13:26 +0300)]
bitexact gaussianblur implementation (#10345)
* Bit-exact implementation of GaussianBlur smoothing
* Added universal intrinsics based implementation for bit-exact CV_8U GaussianBlur smoothing.
* Added parallel_for to evaluation of bit-exact GaussianBlur
* Added custom implementations for 3x3 and 5x5 bit-exact GaussianBlur
Alexander Alekhin [Sun, 21 Jan 2018 17:25:37 +0000 (17:25 +0000)]
Merge pull request #10657 from GlueCrow:mog2_init_fix
Glue Crow [Sun, 21 Jan 2018 15:02:05 +0000 (23:02 +0800)]
ocl: Avoid unnecessary initializing when non-UMat parameters are used
Gregory Morse [Sun, 21 Jan 2018 06:26:48 +0000 (07:26 +0100)]
Merge pull request #10649 from GregoryMorse:patch-3
* Fix for QT image window rectangle
* Update window_QT.h
* Update window_QT.cpp
* trailing whitespace
* highgui: fix QT getWindowImageRect()
Maksim Shabunin [Wed, 17 Jan 2018 13:35:44 +0000 (16:35 +0300)]
run.py: simplified scripts, fixed most of PEP8 warnings
Fangjun Kuang [Fri, 19 Jan 2018 12:23:09 +0000 (13:23 +0100)]
Improve the doc for fundamental matrix.
Vadim Pisarevsky [Fri, 19 Jan 2018 11:12:19 +0000 (11:12 +0000)]
Merge pull request #10629 from GlueCrow:ocl_mog2_test_fix
Namgoo Lee [Fri, 19 Jan 2018 11:06:05 +0000 (20:06 +0900)]
cv::cuda::cvtColor bug fix (#10640)
* cuda::cvtColor bug fix
Fixed bug in conversion formula between RGB space and LUV space.
Testing with opencv_test_cudaimgproc.exe, this commit reduces the number
of failed tests from 191 to 95. (96 more tests pass)
* Rename variables
Vadim Pisarevsky [Fri, 19 Jan 2018 11:02:14 +0000 (11:02 +0000)]
Merge pull request #10637 from catree:fix_perf_build_cuda_9
Alexander Alekhin [Fri, 19 Jan 2018 10:11:56 +0000 (10:11 +0000)]
Merge pull request #10633 from csukuangfj:doc-estimateAffine
Alexander Alekhin [Fri, 19 Jan 2018 10:01:41 +0000 (10:01 +0000)]
Merge pull request #10639 from pengli:dnn
Li Peng [Fri, 19 Jan 2018 10:23:02 +0000 (18:23 +0800)]
more update on MVN layer ocl implementation
cut one ocl kernel if normVariance is disabled,
also use native_powr for performance reason.
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Fri, 19 Jan 2018 09:44:21 +0000 (09:44 +0000)]
Merge pull request #10591 from drkoller:master
catree [Thu, 18 Jan 2018 23:23:02 +0000 (00:23 +0100)]
Fix perf build with CUDA 9.
Fangjun Kuang [Thu, 18 Jan 2018 11:40:59 +0000 (12:40 +0100)]
Improve the documentation for affine transform estimation.
Alexander Alekhin [Thu, 18 Jan 2018 18:26:30 +0000 (18:26 +0000)]
Merge pull request #10625 from pengli:dnn
Fangjun Kuang [Thu, 18 Jan 2018 15:28:13 +0000 (16:28 +0100)]
Improve the doc for cv::Mat::checkVector.
Li Peng [Tue, 16 Jan 2018 13:54:32 +0000 (21:54 +0800)]
ocl support for Deconvolution layer
Signed-off-by: Li Peng <peng.li@intel.com>
Vadim Pisarevsky [Thu, 18 Jan 2018 13:46:27 +0000 (13:46 +0000)]
Merge pull request #10634 from sturkmen72:update_samples
Alexander Alekhin [Thu, 18 Jan 2018 13:39:36 +0000 (13:39 +0000)]
Merge pull request #10605 from alalek:ocl_fix_deadlock
Maksim Shabunin [Thu, 18 Jan 2018 13:37:19 +0000 (16:37 +0300)]
Merge pull request #10621 from mshabunin:disable-docs
Documentation generation refactoring (#10621)
* Documentation build updates:
- disable documentation by default, do not add to ALL target
- combine Doxygen and Javadoc
- optimize Doxygen html
* javadoc: fix path in build directory
* cmake: fix "Documentation" status line
Glue Crow [Thu, 18 Jan 2018 10:49:29 +0000 (18:49 +0800)]
Fix #10525
Gregory Morse [Thu, 18 Jan 2018 04:49:47 +0000 (05:49 +0100)]
Merge pull request #10412 from GregoryMorse:patch-2
Update to add window position and size retrieval to HighGUI (#10412)
* Update highgui.hpp
Add read only property retrieval for enhanced rendering capabilities and more sophisticated research tools
* Update window.cpp
* Update window_w32.cpp
* Update window_QT.cpp
* Update window_QT.h
* Update window_QT.h
* Update window_gtk.cpp
* Update precomp.hpp
* Update highgui_c.h
* Update highgui_c.h
* Update window_w32.cpp
* Update precomp.hpp
* Update window_QT.cpp
* Update window_QT.h
* Update window_gtk.cpp
* Update window_gtk.cpp
* Update window_w32.cpp
* Update window_QT.cpp
* Update window_carbon.cpp
* Update window_cocoa.mm
* Update precomp.hpp
* Update window_cocoa.mm
* Update window_w32.cpp
* Update window_gtk.cpp
* Update window_QT.cpp
* Update window_gtk.cpp
* Update window_QT.cpp
* Update window_cocoa.mm
* Update window_carbon.cpp
* Update window_w32.cpp
* Update window_cocoa.mm
* Update window_gtk.cpp
* Update window_cocoa.mm
* Update window_gtk.cpp
* Update window_cocoa.mm
* Update window_cocoa.mm
* Update window.cpp
* Update test_gui.cpp
* Update test_gui.cpp
* Update test_gui.cpp
* Update highgui_c.h
* Update highgui.hpp
* Update window.cpp
* Update highgui_c.h
* Update test_gui.cpp
* Update highgui.hpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
* Update window.cpp
Alexander Alekhin [Thu, 18 Jan 2018 04:44:59 +0000 (04:44 +0000)]
Merge pull request #10512 from sturkmen72:update_documentation
Suleyman TURKMEN [Sun, 14 Jan 2018 11:05:25 +0000 (14:05 +0300)]
Update samples
Alexander Alekhin [Wed, 17 Jan 2018 20:52:26 +0000 (23:52 +0300)]
Merge pull request #10622 from alalek:fix_build_js
Re-apply protobuf fix for JavaScript builds
Dmitry Kurtaev [Sat, 2 Dec 2017 20:52:35 +0000 (23:52 +0300)]
Re-apply protobuf fix for JavaScript builds
original commit:
f5035150824c49d3a2d7cb7ce69ac1ffbdf8c63d
JavaScript bindings for dnn module
David Koller [Sun, 14 Jan 2018 05:39:11 +0000 (00:39 -0500)]
Make DNN Crop layer match Caffe default offset behavior
and add parametric unit test for crop layer.
Alexander Alekhin [Wed, 17 Jan 2018 11:34:03 +0000 (11:34 +0000)]
Merge pull request #10593 from alalek:android_build_sdk_configuration
Alexander Alekhin [Wed, 17 Jan 2018 09:58:34 +0000 (09:58 +0000)]
Merge pull request #10613 from csukuangfj:fix-10612
Alexander Alekhin [Wed, 17 Jan 2018 09:40:42 +0000 (09:40 +0000)]
Merge pull request #10604 from aimotive:master
Alexander Alekhin [Wed, 17 Jan 2018 09:02:50 +0000 (09:02 +0000)]
Merge pull request #10609 from csukuangfj:patch-1
razerhell [Wed, 17 Jan 2018 09:05:13 +0000 (17:05 +0800)]
Merge pull request #10574 from razerhell:patch-1
* Newton's method can be more efficient
when we get the result of function distortPoint with a point (0, 0) and then undistortPoint with the result, we get the point not (0, 0). and then we discovered that the old method is not convergence sometimes. finally we have gotten the right values by Newton's method.
* modify by advice Newton's method...#10574
* calib3d(fisheye): fix codestyle, update theta before exit EPS check
Alexander Alekhin [Wed, 17 Jan 2018 08:58:25 +0000 (08:58 +0000)]
Merge pull request #10602 from pengli:dnn
Li Peng [Wed, 10 Jan 2018 13:56:42 +0000 (21:56 +0800)]
MVN layer ocl implementation
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Thu, 23 Nov 2017 14:39:10 +0000 (22:39 +0800)]
Power, Tanh and Channels ReLU layer ocl support
Signed-off-by: Li Peng <peng.li@intel.com>
csukuangfj [Tue, 16 Jan 2018 19:46:26 +0000 (20:46 +0100)]
Improve the documentation for cv::completeSymm and cv::RANSACUpdateNumIters.
Fangjun Kuang [Tue, 16 Jan 2018 22:47:15 +0000 (23:47 +0100)]
fix issue #10612.
Csaba Keszegh [Tue, 16 Jan 2018 14:22:26 +0000 (15:22 +0100)]
fix: use CXX_STANDARD when extracting compiler flags for PCH with GNUCXX
When compiling with cmake using -DCMAKE_CXX_STANDARD=11 use `-std=gnu++11`
for PCH compiler flags, otherwise it triggers an error:
opencv_core_Release.gch: not used because `__cplusplus' defined as ` 201103L' not ` 199711L' [-Winvalid-pch]
Use CXX_EXTENSIONS property to select `gnu++11` or `c++11`.
Trying to mimic cmake logic here: https://gitlab.kitware.com/cmake/cmake/blob/master/Source/cmLocalGenerator.cxx#L1527-1557
Alexander Alekhin [Tue, 16 Jan 2018 17:47:30 +0000 (17:47 +0000)]
Merge pull request #10606 from alalek:update_copyright_2018
Alexander Alekhin [Tue, 16 Jan 2018 14:33:06 +0000 (17:33 +0300)]
core(ocl): fix deadlock in UMatDataAutoLock
UMatData locks are not mapped on real locks (they are mapped to some "pre-initialized" pool).
Concurrent execution of these statements may lead to deadlock:
- a.copyTo(b) from thread 1
- c.copyTo(d) from thread 2
where:
- 'a' and 'd' are mapped to single lock "A".
- 'b' and 'c' are mapped to single lock "B".
Workaround is to process locks with strict order.
Woody Chow [Tue, 16 Jan 2018 14:15:23 +0000 (23:15 +0900)]
Propagate calculated Gaussian kernel size(ref). Otherwise, ipp_GaussianBlur will fail if user doesn't specify a kernel size. (#10579)
Alexander Alekhin [Tue, 16 Jan 2018 13:19:32 +0000 (13:19 +0000)]
Merge pull request #10581 from mshabunin:minor-issues-fixes
Maksim Shabunin [Thu, 11 Jan 2018 10:50:35 +0000 (13:50 +0300)]
Add ThinLTO support for clang
Maksim Shabunin [Mon, 25 Dec 2017 13:57:40 +0000 (16:57 +0300)]
Fixed several warnings produced by clang 6 and static analyzers
Alexander Alekhin [Tue, 16 Jan 2018 12:18:18 +0000 (12:18 +0000)]
Merge pull request #10595 from oqtvs:updateProtobuf
Li Peng [Fri, 12 Jan 2018 13:30:19 +0000 (21:30 +0800)]
batch_norm layer ocl update
use a batch_norm ocl kernel to do the work
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Tue, 16 Jan 2018 10:55:42 +0000 (13:55 +0300)]
copyright: 2018
Vadim Pisarevsky [Tue, 16 Jan 2018 10:51:04 +0000 (10:51 +0000)]
Merge pull request #10575 from ioxp:getFontScale
Alexander Alekhin [Mon, 15 Jan 2018 20:28:57 +0000 (20:28 +0000)]
protobuf: drop unused files
Alexander Alekhin [Mon, 15 Jan 2018 19:49:36 +0000 (19:49 +0000)]
dnn: protobuf build warnings
oqtvs [Mon, 15 Jan 2018 15:51:38 +0000 (15:51 +0000)]
dnn: Updated protobuf files (3.5.1)
oqtvs [Mon, 15 Jan 2018 15:51:37 +0000 (13:51 -0200)]
Updated protobuf version to 3.5.1
Alexander Alekhin [Mon, 15 Jan 2018 15:05:32 +0000 (15:05 +0000)]
Merge pull request #10580 from woodychow:parallel_initUndistortRectifyMap
Alexander Alekhin [Mon, 15 Jan 2018 06:07:50 +0000 (06:07 +0000)]
Merge pull request #10585 from dkurt:dnn_weightless_scale
woody.chow [Mon, 15 Jan 2018 00:20:35 +0000 (09:20 +0900)]
Parallelize initUndistortRectifyMap
Alexander Alekhin [Fri, 5 Jan 2018 02:40:37 +0000 (02:40 +0000)]
android: update build_sdk.py
- configuration files for ABIs configuration
- use builtin Android NDK's toolchain by default (force flag to use OpenCV's toolchain)
- default values for 'work_dir' and 'opencv_dir'
Alexander Alekhin [Sun, 14 Jan 2018 08:12:28 +0000 (08:12 +0000)]
Merge pull request #10588 from dkurt:dnn_blobFromImage_ext
Dmitry Kurtaev [Sat, 13 Jan 2018 15:17:56 +0000 (18:17 +0300)]
dnn::blobFromImage with OutputArray
Dmitry Kurtaev [Fri, 12 Jan 2018 08:59:05 +0000 (11:59 +0300)]
Untrainable version of Scale layer from Caffe
Alexander Alekhin [Sat, 13 Jan 2018 04:31:10 +0000 (04:31 +0000)]
Merge pull request #10495 from alalek:cmake_java
Alexander Alekhin [Thu, 4 Jan 2018 04:39:22 +0000 (04:39 +0000)]
cmake: ocv_target_include_directories() handle SYSTEM directories
Alexander Alekhin [Wed, 3 Jan 2018 19:07:55 +0000 (19:07 +0000)]
android: fix SDK build
- fix Javadoc:
- generate Javadoc after gather step to process all Java files (including Android 21)
- generate into 'OpenCV-android-sdk' directly without additional copy step
- use smart copy/move utility functions ('shutil' doesn't well with existed destination)
- by default move files to reduce pressure on storage I/O (> 800Mb)
Alexander Alekhin [Wed, 3 Jan 2018 18:53:32 +0000 (18:53 +0000)]
java: fix MacOS Java problem
Alexander Alekhin [Wed, 3 Jan 2018 17:18:39 +0000 (17:18 +0000)]
java: fix bindings generator
- fix imports override.
Problem is observed with BoostDesc.
- add Ptr<> handling (constructor is protected from other packages).
Observed in ximgproc:
Ptr<StereoMatcher> createRightMatcher(Ptr<StereoMatcher> matcher_left)"
where, "StereoMather" is from another package (calib3d)