8ba88892d7
run.py: simplified scripts, fixed most of PEP8 warnings
2018-01-19 17:05:40 +03:00
c89ae6e537
Merge pull request #10629 from GlueCrow:ocl_mog2_test_fix
2018-01-19 11:12:19 +00:00
25c36fb05f
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
2018-01-19 14:06:05 +03:00
71ba54b2f4
Merge pull request #10637 from catree:fix_perf_build_cuda_9
2018-01-19 11:02:14 +00:00
18ce529256
Merge pull request #10633 from csukuangfj:doc-estimateAffine
2018-01-19 10:11:56 +00:00
26e0f408f0
Merge pull request #10639 from pengli:dnn
2018-01-19 10:01:41 +00:00
fe494297e4
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 >
2018-01-19 22:54:04 +08:00
c3569211d5
Merge pull request #10591 from drkoller:master
2018-01-19 09:44:21 +00:00
dcc5a2cb22
Fix perf build with CUDA 9.
2018-01-19 00:23:02 +01:00
67842df9e2
Improve the documentation for affine transform estimation.
2018-01-18 19:54:18 +01:00
8226bd25c4
Merge pull request #10625 from pengli:dnn
2018-01-18 18:26:30 +00:00
2124361ff7
ocl support for Deconvolution layer
...
Signed-off-by: Li Peng <peng.li@intel.com >
2018-01-18 23:40:22 +08:00
0def2dbb73
Merge pull request #10605 from alalek:ocl_fix_deadlock
2018-01-18 13:39:36 +00:00
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
95ce21d407
Fix #10525
2018-01-18 18:49:29 +08:00
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
f056e713c3
Merge pull request #10512 from sturkmen72:update_documentation
2018-01-18 04:44:59 +00:00
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
b067e0ca5d
Merge pull request #10613 from csukuangfj:fix-10612
2018-01-17 09:58:34 +00:00
4a086cf517
Merge pull request #10609 from csukuangfj:patch-1
2018-01-17 09:02:50 +00:00
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
6728b40ad3
Merge pull request #10602 from pengli:dnn
2018-01-17 08:58:25 +00:00
e77af4ae33
MVN layer ocl implementation
...
Signed-off-by: Li Peng <peng.li@intel.com >
2018-01-17 17:11:32 +08:00
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
decf6cab5e
Improve the documentation for cv::completeSymm and cv::RANSACUpdateNumIters.
2018-01-17 08:05:39 +01:00
2b635edce6
fix issue #10612 .
2018-01-16 23:47:15 +01:00
4dc788ff84
Merge pull request #10606 from alalek:update_copyright_2018
2018-01-16 17:47:30 +00:00
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
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
8b87c4b96a
Fixed several warnings produced by clang 6 and static analyzers
2018-01-16 15:26:28 +03:00
cbb21f3cf2
Merge pull request #10595 from oqtvs:updateProtobuf
2018-01-16 12:18:18 +00:00
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
e6ed853905
copyright: 2018
2018-01-16 13:55:42 +03:00
59915a3fc9
Merge pull request #10575 from ioxp:getFontScale
2018-01-16 10:51:04 +00:00
4d84999452
dnn: protobuf build warnings
2018-01-15 21:15:23 +00:00
6d4b778303
dnn: Updated protobuf files (3.5.1)
2018-01-15 15:51:38 +00:00
be1207e5e4
Merge pull request #10580 from woodychow:parallel_initUndistortRectifyMap
2018-01-15 15:05:32 +00:00
1255bd8d4b
Merge pull request #10585 from dkurt:dnn_weightless_scale
2018-01-15 06:07:50 +00:00
f5d9a2a9c1
Parallelize initUndistortRectifyMap
2018-01-15 09:20:35 +09:00
6a395d88ff
dnn::blobFromImage with OutputArray
2018-01-13 18:20:24 +03:00
1f4fdfd599
Untrainable version of Scale layer from Caffe
2018-01-13 10:35:29 +03:00
839cffdefe
java: fix MacOS Java problem
2018-01-13 02:12:39 +00:00
a362fd80df
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)
2018-01-13 02:12:39 +00:00
1237faef80
java: disable highgui wrapped code
2018-01-13 02:12:39 +00:00
a0d9d6db5b
fixes for old CMake (2.8.12.2)
2018-01-13 02:12:39 +00:00
8533b45ce9
cmake: Java/Android SDK refactoring
2018-01-13 02:12:39 +00:00
dcd4f8f5db
Update documentation
2018-01-12 22:21:14 +03:00
0cad2d2a83
java: files rename
...
intermediate commit (to simplify code review)
2018-01-12 19:14:00 +00:00
73316e10a0
java(test): fix test names
2018-01-12 19:14:00 +00:00
594a93316c
Fixed concurrent OpenCL cache folder name generation
2018-01-12 19:03:16 +03:00
Maksim Shabunin