Michał Janiszewski
85b9960f62
Fix clashing include guards
...
Relevant guards can be found in
ef5579dc86/modules/features2d/src/kaze/AKAZEConfig.h (L8)
and
ef5579dc86/modules/ml/include/opencv2/ml.hpp (L44)
2018-10-16 22:59:38 +02:00
Michał Janiszewski
5640b36f6d
Remove unused empty block
2018-10-16 22:51:03 +02:00
Michał Janiszewski
c8e6ce304f
Catch exceptions by const-reference
...
Exceptions caught by value incur needless cost in C++, most of them can
be caught by const-reference, especially as nearly none are actually
used. This could allow compiler generate a slightly more efficient code.
2018-10-16 22:43:54 +02:00
Paul Shin
1c468add20
Increased the acceptable error margin for perf testing
...
- This is to accommodate the variabiilty in floating-point operations in new platforms/compilers
- Specifically due to the error margin found in NVIDIA Jetson TX2
2018-10-15 20:03:39 -07:00
Alexander Alekhin
edacd91a27
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-15 20:15:42 +00:00
Alexander Alekhin
5dd46b54c1
Merge pull request #12848 from alalek:issue_12337
2018-10-15 20:09:36 +00:00
Alexander Alekhin
24ced3d657
Merge pull request #12846 from alalek:issue_12834
2018-10-15 19:19:46 +00:00
Alexander Alekhin
c5a5d7eb51
Merge pull request #12843 from alalek:fix_qrdecode_input_validation
2018-10-15 19:18:58 +00:00
Alexander Alekhin
ab2c16b2e5
Merge pull request #12829 from tomoaki0705:fixTestVideoOpenCLPyrLK
2018-10-15 19:18:24 +00:00
Alexander Alekhin
113793fee7
Merge pull request #12837 from dkurt:dnn_fix_ie
2018-10-15 19:17:18 +00:00
Alexander Alekhin
954536073d
core: update solveLP() interface
2018-10-15 18:58:11 +00:00
Alexander Alekhin
b54a70a538
videoio: return -1 is incorrect for function with 'bool' result
2018-10-15 18:20:15 +00:00
Alexander Alekhin
cc45c10f3d
ocl: bailout from unsupported types
2018-10-15 18:06:06 +00:00
Alexander Alekhin
6d2cfac303
objdetect: validate QRdecode inputs
...
- drop unnecessary matrix initialization
2018-10-15 17:16:17 +00:00
Alexander Alekhin
13aa23f706
Merge pull request #12836 from dmatveev:gapi_upd151018
2018-10-15 16:20:52 +00:00
Alexander Alekhin
f8a27d2603
Merge pull request #12775 from radomsak:radomsak_dnn_fix_caffe_importer_reused_layers
2018-10-15 14:44:23 +00:00
Alexander Alekhin
f185640eda
Merge pull request #12799 from alalek:update_build_js
...
* js: update build script
- support emscipten 1.38.12 (wasm is ON by default)
- verbose build messages
* js: use builtin Math functions
* js: disable tracing code completelly
2018-10-15 17:35:21 +03:00
Alexander Alekhin
72eccb7694
Merge pull request #12825 from alalek:issue_8413_3.4
2018-10-15 14:23:21 +00:00
Dmitry Matveev
922d5796b9
G-API: Introduce LPI (multiple Lines-Per-Iteration) support for Resize
...
Several Resize optimizations count on fetching multiple input lines at
once to do interpolation more efficiently.
At the moment, Fluid backend supports only LPI=1 for Resize kernels.
This patch introduces scheduling support for Resizes with LPI>1 and
covers these cases with new tests.
The support is initially written by Ruslan Garnov.
2018-10-15 17:11:55 +03:00
Tomoaki Teshima
803f86b9ca
fix test failure of PyrLKOpticalFlow.Mat
...
* remove race condition
* upload _prevPts to OpenCL device explicitly before calling "sparse"
2018-10-15 22:57:08 +09:00
Alexander Alekhin
7bac615d8f
Merge pull request #12344 from terfendail:core_wintr
2018-10-15 13:48:15 +00:00
Dmitry Kurtaev
dc3406eed9
Fix Pooling and Convolution layers from Intel's Inference Engine
2018-10-15 16:40:28 +03:00
Dmitry Matveev
f0ddc2a53c
G-API: Fixed static analysis issue in own::Mat
...
Tool reported a false alarm on possible out-of-bounds access which
was work-arounded to make code more clear
2018-10-15 16:31:31 +03:00
Alexander Alekhin
1cc3f7abbb
Merge pull request #12516 from seiko2plus:changeUnvMultiply16
2018-10-15 12:07:40 +00:00
Adam Radomski
70177143a7
Added test caffe importer layers sharing weights
2018-10-15 11:42:26 +02:00
Vitaly Tuzov
43d9256096
Replaced core module calls to universal intrinsics with wide universal intrinsics
2018-10-15 11:46:45 +03:00
tellowkrinkle
803ff64b14
Merge pull request #12697 from tellowkrinkle:FasterCocoaWindows
...
* Make cocoa windows draw faster
* Use a CALayer for rendering when possible Uses GPU to scale images, which is important because retina macs will want window sizes much larger (in pixels) than the image
* Fix mouse logic for cocoa windows
* Only halve resolution on retina if image is larger than display
2018-10-14 21:18:05 +03:00
Alexander Alekhin
d5d059690f
gapi(test): disable divide tests with zeros
2018-10-14 10:47:50 +00:00
Alexander Alekhin
fd832bb57d
core: follow IEEE 754 rules for floating-point division
2018-10-14 10:47:50 +00:00
Alexander Alekhin
09cb329d73
core(test): zero values divide test (4.0+)
2018-10-14 03:46:29 +00:00
Alexander Alekhin
4a9291fd89
Merge branch 'issue_8413_3.4'
2018-10-14 03:46:01 +00:00
Alexander Alekhin
5677a683a5
core(test): zero values divide test (3.x)
2018-10-14 02:23:17 +00:00
Alexander Alekhin
c813ad5533
core(ocl): replace ambiguous 'depth' to 'DEPTH_dst'
...
- always pass DEPTH_dst value to core/arithm kernel
2018-10-14 02:18:04 +00:00
tompollok
0b77600718
change area() emptiness checks to empty()
2018-10-13 21:35:10 +02:00
Alexander Alekhin
5115e5decb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-13 16:19:05 +00:00
Alexander Alekhin
429a643f42
Merge pull request #12805 from drkoller:imwritedoc
2018-10-13 13:20:33 +00:00
Alexander Alekhin
d2a66d3c99
Merge pull request #12815 from alalek:issue_12812
2018-10-13 13:12:55 +00:00
Alexander Alekhin
0f41daeba5
Merge pull request #12641 from dkurt:dnn_samples_args_autofill
2018-10-13 12:28:08 +00:00
drkoller
978ad4981e
Clean up documentation for imread and imwrite
2018-10-12 17:08:01 -04:00
Alexander Alekhin
8c4f886f5f
core: re-throw allocation exception if there is no fallback
2018-10-12 19:10:06 +00:00
Alexander Alekhin
0d63c4c28e
Merge pull request #12811 from take1014:resize_large_image
2018-10-12 16:59:25 +00:00
take1014
24af70c7e0
resolves 11283
2018-10-12 23:08:25 +09:00
Alexander Alekhin
1ed9ff17e1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-12 10:05:55 +00:00
Sayed Adel
9dc1d388af
imgproc: Enable VSX on pyrDown & pyrUp
2018-10-11 23:03:57 +00:00
Alexander Alekhin
91c6d36ff8
Merge pull request #12796 from alalek:fix_openmp_performance
2018-10-11 19:29:04 +00:00
Alexander Alekhin
be76b451cb
Merge pull request #12791 from alalek:win32_dllmain_detect_termination
2018-10-11 19:28:29 +00:00
Alexander Alekhin
53785b6ac6
Merge pull request #12784 from terfendail:pyramids_wintr
2018-10-11 19:26:36 +00:00
Alexander Alekhin
2332fb852d
Merge pull request #12748 from terfendail:resize_wintr2
2018-10-11 19:26:17 +00:00
Alexander Alekhin
f1fdfa1a51
Merge pull request #12623 from sturkmen72:videoio-4
2018-10-11 19:24:57 +00:00
Alexander Alekhin
0f3fe957f5
Merge pull request #12450 from sturkmen72:update_HOGDescriptor
2018-10-11 19:23:35 +00:00
Alexander Alekhin
41398987c3
Merge pull request #12792 from tomoaki0705:fixCudaImgprocColorGray
2018-10-11 16:32:11 +00:00
Tomoaki Teshima
944710de4e
update the threshold
...
* fix test failure of cudaimgproc convert color bgr2lab series
2018-10-11 18:45:20 +09:00
Alexander Alekhin
2b3c7490d5
Merge pull request #12521 from allnes:detect_qr_code
...
Objdetect: QRCode detect + decode
2018-10-11 12:42:05 +03:00
Sayed Adel
8965f3ae06
imgproc:simd Enable VSX and wide universal intrinsics for accumulate operations
...
- improve cpu dispatching calls to allow more SIMD extentions
(SSE4.1, AVX2, VSX)
- wide universal intrinsics
- replace dummy v_expand with v_expand_low
- replace v_expand + v_mul_wrap with v_mul_expand for product accumulate operations
- use FMA for accumulate operations
- add mask and more types to accumulate's performance tests
2018-10-11 04:37:12 +02:00
Sayed Adel
5771fd693d
Change behaviour of 16-bit multiply operator
...
- redefine 16-bit multiply operator to perform saturating multiply
instead of non-saturating multiply
- implement 8-bit multiply operator to perform saturating multiply
- implement v_mul_wrap() for 8-bit, 16-bit non-saturating multiply
- improve performance of v_mul_hi() for VSX
- update intrin tests with new changes
- replace unv 16-bit multiplication operator with v_mul_wrap due behavior changes
- Several improvements depend on vpisarev review
* initial forward declarations for universal intrinsics
* move emulating SSE intrinsics into separate file
* implement v_mul_expand for 8-bit
* reimplement saturating multiply using v_mul_expand + v_pack
* map v_expand, v_load_expand, v_load_expand_q to sse4.1
* fix overflow avx2::v_pack(uint32)
* implement two universal intrinsics v_expand_low and v_expand_high
2018-10-11 04:35:39 +02:00
Vitaly Tuzov
1ff11c84ab
Fixed meanStdDev() implementation for the case input matrix has more than 4 channels
2018-10-11 04:30:33 +02:00
Alexander Alekhin
fc4679d4cf
Merge pull request #12795 from mshabunin:fix-win-python
2018-10-10 20:55:32 +00:00
Alexander Alekhin
761c269e47
Merge pull request #12794 from alalek:fix_warnings
2018-10-10 20:22:07 +00:00
Alexander Alekhin
35c53204cb
Merge pull request #12781 from alalek:videoio_drop_rectification_dc1394
2018-10-10 20:01:06 +00:00
Alexander Alekhin
f731515628
cmake: fix Python detection for standalone bindings
2018-10-10 22:59:42 +03:00
Alexander Alekhin
4e62900009
core: call omp_set_dynamic() for better CPU usage
...
Similar to 'OMP_DYNAMIC=TRUE'.
2018-10-10 19:57:43 +00:00
Alexander Alekhin
7813eef92b
fix build warnings
2018-10-10 19:26:19 +00:00
Suleyman TURKMEN
59bf2a34fa
Update videoio
2018-10-10 21:58:04 +03:00
Suleyman TURKMEN
abbb73e894
Update HOGDescriptor
2018-10-10 21:53:35 +03:00
Vitaly Tuzov
cc10e6b344
pyrDown and pyrUp SSE2 implementations replaced with wide universal intrinsics implementations
2018-10-10 21:12:47 +03:00
Alexander Alekhin
11e2a216c5
ocl(win32): bypass deallocate() during process termination
2018-10-10 18:06:06 +00:00
Alexander Alekhin
404893810c
cmake: fix Python detection for standalone bindings
2018-10-10 16:58:23 +00:00
Alexander Nesterov
53ec8f286b
Added QR code decoding.
2018-10-10 15:27:00 +00:00
Alexander Alekhin
70f2ee917e
cmake: add DllMain() into each OpenCV DLL
...
to detect process termination after ExitProcess() call
2018-10-10 11:00:59 +00:00
Adam Radomski
cc3ec5d453
Fix dnn caffe importer extract blobs from reused layers
2018-10-10 10:44:56 +02:00
Alexander Alekhin
dada5a422d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-09 21:20:15 +00:00
Hamdi Sahloul
c4d434fd6f
CUDA/BgSegm: fix the threshold of MOG2.Update test when detectShadow=true ( #12762 )
2018-10-09 17:39:39 +03:00
Alexander Alekhin
8bb3d363a4
videoio: drop rectification code for VIDERE cameras
2018-10-09 14:06:15 +00:00
Apoorv Goel
b8aa0cddab
Merge pull request #12777 from UnderscoreAsterisk:document-cvtColorTwoPlane
...
* Add documentation for cvtColorTwoPlane
* Change brief and add links
2018-10-09 15:49:17 +03:00
Lubov Batanina
50811e04f2
Merge pull request #12596 from l-bat:l-bat/shufflenet_onnx
...
* Add Shufflenet support in ONNX
* Add test for transpose layer
2018-10-08 22:18:41 +03:00
Alexander Alekhin
449826288b
Merge pull request #12765 from cv3d:ts/cuda/device_name
2018-10-08 19:15:54 +00:00
Alexander Alekhin
68fe37b008
Merge pull request #12755 from alalek:fix_allocSingleton
2018-10-08 15:30:17 +00:00
Alexander Alekhin
26ba4f3c1d
Merge pull request #12754 from alalek:dnn_ocl4dnn_async_expressions
2018-10-08 15:22:24 +00:00
Alexander Alekhin
e19b422854
Merge pull request #12752 from alalek:dnn_cleanup_getUMat
2018-10-08 15:21:50 +00:00
Vitaly Tuzov
9d602f2752
Replaced SSE2 area resize implementation with wide universal intrinsic implementation
2018-10-08 16:27:52 +03:00
Dmitry Kurtaev
7649e537b7
Fix JavaScript bindings for features2d module
2018-10-07 22:55:38 +03:00
Hamdi Sahloul
2faa4cd933
TS/CUDA: Show device ID in case of multiple devices
2018-10-08 03:00:25 +09:00
Alexander Alekhin
18bf91a08b
core: update allocSingleton implementation, valgrind suppression
2018-10-05 18:25:13 +03:00
Alexander Alekhin
634dd656d5
dnn: don't use Mat expressions with async UMat functions
2018-10-05 17:09:50 +03:00
Alexander Alekhin
9d02d42afe
dnn(ocl4dnn): don't use getUMat()
...
especially in CPU only processing
2018-10-05 15:24:51 +03:00
Alexander Alekhin
c716e374c1
Merge pull request #12744 from alalek:issue_12736
2018-10-05 10:20:13 +00:00
Alexander Alekhin
aeec6e43eb
Merge pull request #12749 from powderluv:fix-clang-cl-tzcnt
2018-10-05 09:28:07 +00:00
Alexander Alekhin
8f1f4273a2
calib3d: move undistort files from imgproc
2018-10-05 07:52:21 +00:00
Anush Elangovan
630a94b8b7
_tzcnt_u32() is undefined in clang-cl so use alternate impl
...
_tzcnt_u32() is not exported by clang-cl intrin.h so check for
clang-cl and enable an alterate for _tzcnt_u32()
Some discussions:
http://lists.llvm.org/pipermail/cfe-dev/2016-October/051329.html
https://bugs.llvm.org/show_bug.cgi?id=30506
TEST=Build with clang-cl
2018-10-04 14:04:22 -07:00
Rostislav Vasilikhin
da5e0ef461
ocl::KernelArg::Local(): added size argument
2018-10-04 17:19:09 +03:00
Alexander Alekhin
0926a84a45
cmake: define CV_ErrorNoReturn under CV_STATIC_ANALYSIS
...
to avoid build break without `__OPENCV_BUILD`
2018-10-04 14:43:43 +03:00
Alexander Alekhin
0101fa789c
Merge pull request #12735 from tomoaki0705:fixCudaStereoTestFailure
2018-10-04 11:33:34 +00:00
Alexander Alekhin
12b3d157a5
Merge pull request #12726 from alalek:dnn_ocl_conv_avoid_multiple_expr_evaluation
2018-10-04 11:31:47 +00:00
Tomoaki Teshima
7294ae0f17
fix test failure of StereoBeliefPropagation
...
* if the src has odd number of height, access error happens
* it could happen on width, too
* check both dst and src range in both width and height
2018-10-04 08:35:34 +09:00
Apoorv Goel
0ffc186680
Merge pull request #12731 from UnderscoreAsterisk:fix-12012
...
* fix #12012
* Replace CV_StsBadFlag with Error::StsBadFlag
2018-10-03 15:50:04 +03:00
Alexander Alekhin
068ebe8b4d
Merge pull request #12693 from peters:patch-1
2018-10-03 06:14:44 +00:00
Alexander Alekhin
eec468fa13
dnn(ocl4dnn): calculate activation expression once
...
- to avoid multiple conditional calls via sub_group() functions
2018-10-02 21:23:41 +00:00
Alexander Alekhin
81c94357e8
Merge pull request #12722 from tomoaki0705:fixCudaFiltersFailure
2018-10-02 20:52:34 +00:00
Peter Rekdal Sunde
042c486b68
Obtain fourcc when AVStream
is network stream
...
The `codec_tag` is only available when opening a file from disk. If `AVStream` is a network stream then `fourcc` must be obtained using `codec_id`. I have tested the following scenarios:
1) Open a `.mp4` file and verify that `codec_tag` is returned (old behavior)
2) Open a `rtsp` stream and verify that `codec_fourcc` is returned (Tested with a MJPEG, H264 and H265 stream)
2018-10-02 22:15:05 +02:00
Alexander Alekhin
6921f967a1
Merge pull request #12605 from terfendail:integral_wintr
2018-10-02 16:40:13 +00:00