Alexander Alekhin
c3569211d5
Merge pull request #10591 from drkoller:master
2018-01-19 09:44:21 +00:00
catree
dcc5a2cb22
Fix perf build with CUDA 9.
2018-01-19 00:23:02 +01:00
Fangjun Kuang
67842df9e2
Improve the documentation for affine transform estimation.
2018-01-18 19:54:18 +01:00
Alexander Alekhin
8226bd25c4
Merge pull request #10625 from pengli:dnn
2018-01-18 18:26:30 +00:00
Fangjun Kuang
8efe7bafaa
Improve the doc for cv::Mat::checkVector.
2018-01-18 16:48:59 +01:00
Li Peng
2124361ff7
ocl support for Deconvolution layer
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-18 23:40:22 +08:00
Vadim Pisarevsky
42459cad02
Merge pull request #10634 from sturkmen72:update_samples
2018-01-18 13:46:27 +00:00
Alexander Alekhin
0def2dbb73
Merge pull request #10605 from alalek:ocl_fix_deadlock
2018-01-18 13:39:36 +00:00
Maksim Shabunin
1b0ff57562
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
2018-01-18 16:37:19 +03:00
Glue Crow
95ce21d407
Fix #10525
2018-01-18 18:49:29 +08:00
Gregory Morse
ec353dbdda
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
2018-01-18 07:49:47 +03:00
Alexander Alekhin
f056e713c3
Merge pull request #10512 from sturkmen72:update_documentation
2018-01-18 04:44:59 +00:00
Suleyman TURKMEN
4046d9f850
Update samples
2018-01-18 07:04:42 +03:00
Alexander Alekhin
aa55cdb735
Merge pull request #10622 from alalek:fix_build_js
...
Re-apply protobuf fix for JavaScript builds
2018-01-17 23:52:26 +03:00
Dmitry Kurtaev
ec8d39d059
Re-apply protobuf fix for JavaScript builds
...
original commit: f503515082
JavaScript bindings for dnn module
2018-01-17 20:20:00 +00:00
David Koller
d1a3b530be
Make DNN Crop layer match Caffe default offset behavior
...
and add parametric unit test for crop layer.
2018-01-17 10:52:36 -05:00
Alexander Alekhin
a55aed5f42
Merge pull request #10593 from alalek:android_build_sdk_configuration
2018-01-17 11:34:03 +00:00
Alexander Alekhin
b067e0ca5d
Merge pull request #10613 from csukuangfj:fix-10612
2018-01-17 09:58:34 +00:00
Alexander Alekhin
85e133a051
Merge pull request #10604 from aimotive:master
2018-01-17 09:40:42 +00:00
Alexander Alekhin
4a086cf517
Merge pull request #10609 from csukuangfj:patch-1
2018-01-17 09:02:50 +00:00
razerhell
fb22028be3
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
2018-01-17 12:05:13 +03:00
Alexander Alekhin
6728b40ad3
Merge pull request #10602 from pengli:dnn
2018-01-17 08:58:25 +00:00
Li Peng
e77af4ae33
MVN layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-17 17:11:32 +08:00
Li Peng
7bc017601f
Power, Tanh and Channels ReLU layer ocl support
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-17 17:11:27 +08:00
csukuangfj
decf6cab5e
Improve the documentation for cv::completeSymm and cv::RANSACUpdateNumIters.
2018-01-17 08:05:39 +01:00
Fangjun Kuang
2b635edce6
fix issue #10612 .
2018-01-16 23:47:15 +01:00
Csaba Keszegh
2aa18ca3e9
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
2018-01-16 20:32:21 +01:00
Alexander Alekhin
4dc788ff84
Merge pull request #10606 from alalek:update_copyright_2018
2018-01-16 17:47:30 +00:00
Alexander Alekhin
cec700525c
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.
2018-01-16 17:33:06 +03:00
Woody Chow
20b3261204
Propagate calculated Gaussian kernel size(ref). Otherwise, ipp_GaussianBlur will fail if user doesn't specify a kernel size. ( #10579 )
2018-01-16 17:15:23 +03:00
Alexander Alekhin
ab8cf31ae9
Merge pull request #10581 from mshabunin:minor-issues-fixes
2018-01-16 13:19:32 +00:00
Maksim Shabunin
c0ae812aa2
Add ThinLTO support for clang
2018-01-16 15:26:28 +03:00
Maksim Shabunin
8b87c4b96a
Fixed several warnings produced by clang 6 and static analyzers
2018-01-16 15:26:28 +03:00
Alexander Alekhin
cbb21f3cf2
Merge pull request #10595 from oqtvs:updateProtobuf
2018-01-16 12:18:18 +00:00
Li Peng
4189214d04
batch_norm layer ocl update
...
use a batch_norm ocl kernel to do the work
Signed-off-by: Li Peng <peng.li@intel.com>
2018-01-16 19:01:58 +08:00
Alexander Alekhin
e6ed853905
copyright: 2018
2018-01-16 13:55:42 +03:00
Vadim Pisarevsky
59915a3fc9
Merge pull request #10575 from ioxp:getFontScale
2018-01-16 10:51:04 +00:00
Alexander Alekhin
22816a4c43
protobuf: drop unused files
2018-01-15 21:15:23 +00:00
Alexander Alekhin
4d84999452
dnn: protobuf build warnings
2018-01-15 21:15:23 +00:00
oqtvs
6d4b778303
dnn: Updated protobuf files (3.5.1)
2018-01-15 15:51:38 +00:00
oqtvs
df0b83332d
Updated protobuf version to 3.5.1
2018-01-15 13:51:37 -02:00
Alexander Alekhin
be1207e5e4
Merge pull request #10580 from woodychow:parallel_initUndistortRectifyMap
2018-01-15 15:05:32 +00:00
Alexander Alekhin
1255bd8d4b
Merge pull request #10585 from dkurt:dnn_weightless_scale
2018-01-15 06:07:50 +00:00
woody.chow
f5d9a2a9c1
Parallelize initUndistortRectifyMap
2018-01-15 09:20:35 +09:00
Alexander Alekhin
edcbbee979
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'
2018-01-14 16:05:48 +00:00
Alexander Alekhin
70ff4af4fa
Merge pull request #10588 from dkurt:dnn_blobFromImage_ext
2018-01-14 08:12:29 +00:00
Dmitry Kurtaev
6a395d88ff
dnn::blobFromImage with OutputArray
2018-01-13 18:20:24 +03:00
Dmitry Kurtaev
1f4fdfd599
Untrainable version of Scale layer from Caffe
2018-01-13 10:35:29 +03:00
Alexander Alekhin
0c00652f6b
Merge pull request #10495 from alalek:cmake_java
2018-01-13 04:31:10 +00:00
Alexander Alekhin
91e10a3105
cmake: ocv_target_include_directories() handle SYSTEM directories
2018-01-13 02:12:39 +00:00