platform/upstream/opencv.git
6 years agoMerge pull request #12791 from alalek:win32_dllmain_detect_termination
Alexander Alekhin [Thu, 11 Oct 2018 19:28:29 +0000 (19:28 +0000)]
Merge pull request #12791 from alalek:win32_dllmain_detect_termination

6 years agoMerge pull request #12784 from terfendail:pyramids_wintr
Alexander Alekhin [Thu, 11 Oct 2018 19:26:36 +0000 (19:26 +0000)]
Merge pull request #12784 from terfendail:pyramids_wintr

6 years agoMerge pull request #12748 from terfendail:resize_wintr2
Alexander Alekhin [Thu, 11 Oct 2018 19:26:17 +0000 (19:26 +0000)]
Merge pull request #12748 from terfendail:resize_wintr2

6 years agoMerge pull request #12792 from tomoaki0705:fixCudaImgprocColorGray
Alexander Alekhin [Thu, 11 Oct 2018 16:32:11 +0000 (16:32 +0000)]
Merge pull request #12792 from tomoaki0705:fixCudaImgprocColorGray

6 years agoupdate the threshold
Tomoaki Teshima [Thu, 11 Oct 2018 09:45:20 +0000 (18:45 +0900)]
update the threshold
  * fix test failure of cudaimgproc convert color bgr2lab series

6 years agoMerge pull request #12521 from allnes:detect_qr_code
Alexander Alekhin [Thu, 11 Oct 2018 09:42:05 +0000 (12:42 +0300)]
Merge pull request #12521 from allnes:detect_qr_code

Objdetect: QRCode detect + decode

6 years agojs: enable calib3d code (no bindings)
Alexander Alekhin [Thu, 11 Oct 2018 00:49:45 +0000 (00:49 +0000)]
js: enable calib3d code (no bindings)

6 years agoMerge pull request #12794 from alalek:fix_warnings
Alexander Alekhin [Wed, 10 Oct 2018 20:22:07 +0000 (20:22 +0000)]
Merge pull request #12794 from alalek:fix_warnings

6 years agoMerge pull request #12793 from alalek:cmake_fix_python_standalone
Alexander Alekhin [Wed, 10 Oct 2018 20:03:02 +0000 (20:03 +0000)]
Merge pull request #12793 from alalek:cmake_fix_python_standalone

6 years agofix build warnings
Alexander Alekhin [Wed, 10 Oct 2018 19:26:19 +0000 (19:26 +0000)]
fix build warnings

6 years agopyrDown and pyrUp SSE2 implementations replaced with wide universal intrinsics implem...
Vitaly Tuzov [Tue, 9 Oct 2018 17:37:11 +0000 (20:37 +0300)]
pyrDown and pyrUp SSE2 implementations replaced with wide universal intrinsics implementations

6 years agoocl(win32): bypass deallocate() during process termination
Alexander Alekhin [Wed, 10 Oct 2018 18:04:39 +0000 (18:04 +0000)]
ocl(win32): bypass deallocate() during process termination

6 years agocmake: fix Python detection for standalone bindings
Alexander Alekhin [Wed, 10 Oct 2018 13:03:57 +0000 (16:03 +0300)]
cmake: fix Python detection for standalone bindings

6 years agoAdded QR code decoding.
Alexander Nesterov [Fri, 17 Aug 2018 16:01:02 +0000 (13:01 -0300)]
Added QR code decoding.

6 years agocmake: add DllMain() into each OpenCV DLL
Alexander Alekhin [Wed, 10 Oct 2018 10:53:46 +0000 (13:53 +0300)]
cmake: add DllMain() into each OpenCV DLL

to detect process termination after ExitProcess() call

6 years agoMerge pull request #12788 from alalek:samples_winpack_support_buildtools
Alexander Alekhin [Wed, 10 Oct 2018 09:18:32 +0000 (09:18 +0000)]
Merge pull request #12788 from alalek:samples_winpack_support_buildtools

6 years agosamples: add search for MSVS 2017 BuildTools
Alexander Alekhin [Wed, 10 Oct 2018 00:34:34 +0000 (00:34 +0000)]
samples: add search for MSVS 2017 BuildTools

6 years agoMerge pull request #12636 from alalek:winpack_samples_cpp_build_script
Alexander Alekhin [Tue, 9 Oct 2018 16:01:29 +0000 (19:01 +0300)]
Merge pull request #12636 from alalek:winpack_samples_cpp_build_script

* samples: add winpack "drap & drop" build script

* samples: add search for MSVS 2017 Enterprise

6 years agoCUDA/BgSegm: fix the threshold of MOG2.Update test when detectShadow=true (#12762)
Hamdi Sahloul [Tue, 9 Oct 2018 14:39:39 +0000 (23:39 +0900)]
CUDA/BgSegm: fix the threshold of MOG2.Update test when detectShadow=true (#12762)

6 years agoMerge pull request #12777 from UnderscoreAsterisk:document-cvtColorTwoPlane
Apoorv Goel [Tue, 9 Oct 2018 12:49:17 +0000 (18:19 +0530)]
Merge pull request #12777 from UnderscoreAsterisk:document-cvtColorTwoPlane

* Add documentation for cvtColorTwoPlane

* Change brief and add links

6 years agoMerge pull request #12596 from l-bat:l-bat/shufflenet_onnx
Lubov Batanina [Mon, 8 Oct 2018 19:18:41 +0000 (22:18 +0300)]
Merge pull request #12596 from l-bat:l-bat/shufflenet_onnx

* Add Shufflenet support in ONNX

* Add test for transpose layer

6 years agoMerge pull request #12765 from cv3d:ts/cuda/device_name
Alexander Alekhin [Mon, 8 Oct 2018 19:15:54 +0000 (19:15 +0000)]
Merge pull request #12765 from cv3d:ts/cuda/device_name

6 years agoMerge pull request #12755 from alalek:fix_allocSingleton
Alexander Alekhin [Mon, 8 Oct 2018 15:30:16 +0000 (15:30 +0000)]
Merge pull request #12755 from alalek:fix_allocSingleton

6 years agoMerge pull request #12754 from alalek:dnn_ocl4dnn_async_expressions
Alexander Alekhin [Mon, 8 Oct 2018 15:22:23 +0000 (15:22 +0000)]
Merge pull request #12754 from alalek:dnn_ocl4dnn_async_expressions

6 years agoMerge pull request #12752 from alalek:dnn_cleanup_getUMat
Alexander Alekhin [Mon, 8 Oct 2018 15:21:50 +0000 (15:21 +0000)]
Merge pull request #12752 from alalek:dnn_cleanup_getUMat

6 years agoMerge pull request #12725 from alalek:cmake_python_win32
Alexander Alekhin [Mon, 8 Oct 2018 14:45:50 +0000 (17:45 +0300)]
Merge pull request #12725 from alalek:cmake_python_win32

* cmake: don't ignore Python from PATH environment variable

- this breaks selection between 32/64-bit Python
- this breaks Anaconda/Conda environments
- it is not the CMake default behavior, expected by many projects

* cmake: add Python version check, fallback path on CMake 3.12+

* cmake: drop Python 2.6, allow version selection for Python 3.x

6 years agoMerge pull request #12767 from dkurt:fix_js_features2d
Alexander Alekhin [Mon, 8 Oct 2018 14:36:32 +0000 (14:36 +0000)]
Merge pull request #12767 from dkurt:fix_js_features2d

6 years agoReplaced SSE2 area resize implementation with wide universal intrinsic implementation
Vitaly Tuzov [Tue, 25 Sep 2018 11:14:21 +0000 (14:14 +0300)]
Replaced SSE2 area resize implementation with wide universal intrinsic implementation

6 years agoFix JavaScript bindings for features2d module
Dmitry Kurtaev [Sun, 7 Oct 2018 19:55:38 +0000 (22:55 +0300)]
Fix JavaScript bindings for features2d module

6 years agoTS/CUDA: Show device ID in case of multiple devices
Hamdi Sahloul [Sun, 7 Oct 2018 17:51:45 +0000 (02:51 +0900)]
TS/CUDA: Show device ID in case of multiple devices

6 years agoMerge pull request #12753 from mshabunin:fix-ffmpeg-dl
Alexander Alekhin [Fri, 5 Oct 2018 16:03:34 +0000 (16:03 +0000)]
Merge pull request #12753 from mshabunin:fix-ffmpeg-dl

6 years agocore: update allocSingleton implementation, valgrind suppression
Alexander Alekhin [Fri, 5 Oct 2018 15:23:05 +0000 (18:23 +0300)]
core: update allocSingleton implementation, valgrind suppression

6 years agoFFmpeg: correct licenses install location
Maksim Shabunin [Fri, 5 Oct 2018 13:38:44 +0000 (16:38 +0300)]
FFmpeg: correct licenses install location

6 years agodnn: don't use Mat expressions with async UMat functions
Alexander Alekhin [Fri, 5 Oct 2018 14:06:50 +0000 (17:06 +0300)]
dnn: don't use Mat expressions with async UMat functions

6 years agodnn(ocl4dnn): don't use getUMat()
Alexander Alekhin [Fri, 5 Oct 2018 12:10:58 +0000 (15:10 +0300)]
dnn(ocl4dnn): don't use getUMat()

especially in CPU only processing

6 years agoMerge pull request #12744 from alalek:issue_12736
Alexander Alekhin [Fri, 5 Oct 2018 10:20:12 +0000 (10:20 +0000)]
Merge pull request #12744 from alalek:issue_12736

6 years agoMerge pull request #12749 from powderluv:fix-clang-cl-tzcnt
Alexander Alekhin [Fri, 5 Oct 2018 09:28:07 +0000 (09:28 +0000)]
Merge pull request #12749 from powderluv:fix-clang-cl-tzcnt

6 years ago_tzcnt_u32() is undefined in clang-cl so use alternate impl
Anush Elangovan [Thu, 4 Oct 2018 17:48:14 +0000 (10:48 -0700)]
_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

6 years agoMerge pull request #12745 from savuor:fix/ocl_arg_local_size
Alexander Alekhin [Thu, 4 Oct 2018 16:42:16 +0000 (16:42 +0000)]
Merge pull request #12745 from savuor:fix/ocl_arg_local_size

6 years agoocl::KernelArg::Local(): added size argument
Rostislav Vasilikhin [Thu, 4 Oct 2018 11:26:32 +0000 (14:26 +0300)]
ocl::KernelArg::Local(): added size argument

6 years agoMerge pull request #12741 from GeorgeMironov:fix-cmake-protobuf
Alexander Alekhin [Thu, 4 Oct 2018 14:17:22 +0000 (14:17 +0000)]
Merge pull request #12741 from GeorgeMironov:fix-cmake-protobuf

6 years agocmake: define CV_ErrorNoReturn under CV_STATIC_ANALYSIS
Alexander Alekhin [Thu, 4 Oct 2018 11:43:43 +0000 (14:43 +0300)]
cmake: define CV_ErrorNoReturn under CV_STATIC_ANALYSIS

to avoid build break without `__OPENCV_BUILD`

6 years agoMerge pull request #12735 from tomoaki0705:fixCudaStereoTestFailure
Alexander Alekhin [Thu, 4 Oct 2018 11:33:34 +0000 (11:33 +0000)]
Merge pull request #12735 from tomoaki0705:fixCudaStereoTestFailure

6 years agoMerge pull request #12726 from alalek:dnn_ocl_conv_avoid_multiple_expr_evaluation
Alexander Alekhin [Thu, 4 Oct 2018 11:31:47 +0000 (11:31 +0000)]
Merge pull request #12726 from alalek:dnn_ocl_conv_avoid_multiple_expr_evaluation

6 years agoFix install with external protobuf
Georgy Mironov [Thu, 4 Oct 2018 10:48:40 +0000 (13:48 +0300)]
Fix install with external protobuf

6 years agofix test failure of StereoBeliefPropagation
Tomoaki Teshima [Wed, 3 Oct 2018 23:35:34 +0000 (08:35 +0900)]
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

6 years agoMerge pull request #12731 from UnderscoreAsterisk:fix-12012
Apoorv Goel [Wed, 3 Oct 2018 12:50:04 +0000 (18:20 +0530)]
Merge pull request #12731 from UnderscoreAsterisk:fix-12012

* fix #12012

* Replace CV_StsBadFlag with Error::StsBadFlag

6 years agoMerge pull request #12727 from rnk:fix-clang-cl-cmake
Alexander Alekhin [Wed, 3 Oct 2018 07:21:06 +0000 (07:21 +0000)]
Merge pull request #12727 from rnk:fix-clang-cl-cmake

6 years agoMerge pull request #12693 from peters:patch-1
Alexander Alekhin [Wed, 3 Oct 2018 06:14:43 +0000 (06:14 +0000)]
Merge pull request #12693 from peters:patch-1

6 years agoFix CMake for clang-cl
Reid Kleckner [Tue, 2 Oct 2018 21:30:52 +0000 (14:30 -0700)]
Fix CMake for clang-cl

Avoids passing -Wall, which will enable literally every warning in
Clang. Avoids passing -ffunction-sections etc to clang-cl, which each
generate warnings.

6 years agodnn(ocl4dnn): calculate activation expression once
Alexander Alekhin [Tue, 2 Oct 2018 21:10:52 +0000 (21:10 +0000)]
dnn(ocl4dnn): calculate activation expression once

- to avoid multiple conditional calls via sub_group() functions

6 years agoMerge pull request #12722 from tomoaki0705:fixCudaFiltersFailure
Alexander Alekhin [Tue, 2 Oct 2018 20:52:34 +0000 (20:52 +0000)]
Merge pull request #12722 from tomoaki0705:fixCudaFiltersFailure

6 years agoObtain fourcc when `AVStream` is network stream
Peter Rekdal Sunde [Sat, 29 Sep 2018 17:43:01 +0000 (19:43 +0200)]
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)

6 years agoMerge pull request #12605 from terfendail:integral_wintr
Alexander Alekhin [Tue, 2 Oct 2018 16:40:13 +0000 (16:40 +0000)]
Merge pull request #12605 from terfendail:integral_wintr

6 years agoMerge pull request #12581 from terfendail:lapack_intr
Alexander Alekhin [Tue, 2 Oct 2018 16:39:50 +0000 (16:39 +0000)]
Merge pull request #12581 from terfendail:lapack_intr

6 years agofix test failure of cudafilters Median_Accuracy
Tomoaki Teshima [Tue, 2 Oct 2018 15:59:08 +0000 (00:59 +0900)]
fix test failure of cudafilters Median_Accuracy
  * avoid race condition

6 years agoSSE2 code in invert() replaced with universal intrinsics
Vitaly Tuzov [Tue, 18 Sep 2018 09:22:34 +0000 (12:22 +0300)]
SSE2 code in invert() replaced with universal intrinsics

6 years agoMerge pull request #12649 from sturkmen72:patch-9
Suleyman TURKMEN [Mon, 1 Oct 2018 19:22:37 +0000 (22:22 +0300)]
Merge pull request #12649 from sturkmen72:patch-9

Update hog.cpp (#12649)

6 years agoMerge pull request #12669 from mshabunin:add-paths-config
Alexander Alekhin [Mon, 1 Oct 2018 15:57:57 +0000 (15:57 +0000)]
Merge pull request #12669 from mshabunin:add-paths-config

6 years agoMerge pull request #12620 from alalek:ocl_extra_build_options
Alexander Alekhin [Mon, 1 Oct 2018 15:57:31 +0000 (15:57 +0000)]
Merge pull request #12620 from alalek:ocl_extra_build_options

6 years agoMerge pull request #12711 from alalek:dnn_ocl_idlf_drop_weights_buf
Alexander Alekhin [Mon, 1 Oct 2018 15:36:49 +0000 (15:36 +0000)]
Merge pull request #12711 from alalek:dnn_ocl_idlf_drop_weights_buf

6 years agoocl: OPENCV_OPENCL_BUILD_EXTRA_OPTIONS parameter
Alexander Alekhin [Fri, 21 Sep 2018 15:04:18 +0000 (15:04 +0000)]
ocl: OPENCV_OPENCL_BUILD_EXTRA_OPTIONS parameter

6 years agoAdded support for multi-path configuration parameter (env)
Maksim Shabunin [Thu, 27 Sep 2018 12:52:42 +0000 (15:52 +0300)]
Added support for multi-path configuration parameter (env)

6 years agointegral() implementation updated to utilize wide universal intrinsics
Vitaly Tuzov [Fri, 21 Sep 2018 13:21:40 +0000 (16:21 +0300)]
integral() implementation updated to utilize wide universal intrinsics

6 years agoMerge pull request #12714 from antonioborondo:fix_documentation_cuda_compare
Alexander Alekhin [Mon, 1 Oct 2018 13:35:03 +0000 (13:35 +0000)]
Merge pull request #12714 from antonioborondo:fix_documentation_cuda_compare

6 years agoMerge pull request #12709 from WydD:3.4
Alexander Alekhin [Mon, 1 Oct 2018 13:32:51 +0000 (13:32 +0000)]
Merge pull request #12709 from WydD:3.4

6 years agoMerge pull request #12708 from ldevulder:protobuf-fix-compilation-issue-on-s390
Alexander Alekhin [Mon, 1 Oct 2018 13:32:29 +0000 (13:32 +0000)]
Merge pull request #12708 from ldevulder:protobuf-fix-compilation-issue-on-s390

6 years agoFix documentation of cv::cuda::compare
Antonio Borondo [Mon, 1 Oct 2018 12:23:13 +0000 (13:23 +0100)]
Fix documentation of cv::cuda::compare

6 years agoMerge pull request #12705 from berak:imread_document_grayscale
Alexander Alekhin [Sun, 30 Sep 2018 20:59:48 +0000 (23:59 +0300)]
Merge pull request #12705 from berak:imread_document_grayscale

6 years agodnn(ocl4dnn): drop weights_buf
Alexander Alekhin [Sun, 30 Sep 2018 20:22:39 +0000 (20:22 +0000)]
dnn(ocl4dnn): drop weights_buf

- avoid memory access violation during "prefetch" stage

6 years agoFix frame rate rounding in ffmpeg wrapper (#9023)
Loic Petit [Sun, 30 Sep 2018 20:24:02 +0000 (22:24 +0200)]
Fix frame rate rounding in ffmpeg wrapper (#9023)

6 years ago3rdparty/protobuf: fix compilation issue on s390
Loic Devulder [Fri, 28 Sep 2018 13:33:18 +0000 (15:33 +0200)]
3rdparty/protobuf: fix compilation issue on s390

This commit fixes an issue while trying to compile
on s390x architecture.

This is simply a backport of a fixe already applied
in official protobuf code:
- https://github.com/protocolbuffers/protobuf/pull/3955

6 years agodocument imread grayscale behaviour
berak [Sun, 30 Sep 2018 13:22:26 +0000 (15:22 +0200)]
document imread grayscale behaviour

6 years agoMerge pull request #12667 from cv3d:fix/ts_report
Hamdi Sahloul [Sat, 29 Sep 2018 17:03:54 +0000 (02:03 +0900)]
Merge pull request #12667 from cv3d:fix/ts_report

TS: fix Python v2/v3 compatibility (#12667)

* TS: fix Python2.7 compatibility

* TS: fix Python3 compatibility

* py3: use integer division '/' => '//' instead of cast

6 years agoMerge pull request #12690 from cv3d:fix/ts_python_exe
Alexander Alekhin [Sat, 29 Sep 2018 16:39:04 +0000 (16:39 +0000)]
Merge pull request #12690 from cv3d:fix/ts_python_exe

6 years agoMerge pull request #12666 from tomoaki0705:cudevTestFailureLuvRGB
Alexander Alekhin [Sat, 29 Sep 2018 16:36:25 +0000 (16:36 +0000)]
Merge pull request #12666 from tomoaki0705:cudevTestFailureLuvRGB

6 years agoUtilize the currently running Python executable
Hamdi Sahloul [Sat, 29 Sep 2018 10:34:44 +0000 (19:34 +0900)]
Utilize the currently running Python executable

  especially if it matches the module being tested

6 years agofix test failure of cudev
Tomoaki Teshima [Sat, 29 Sep 2018 14:13:12 +0000 (23:13 +0900)]
fix test failure of cudev
  * follow the implementation of Luv2RGBfloat in imgproc/src/color_lab.cpp
  * loosen threshold in cudaimgproc

6 years agoMerge pull request #12682 from soonbro:patch-1
Alexander Alekhin [Sat, 29 Sep 2018 13:03:38 +0000 (16:03 +0300)]
Merge pull request #12682 from soonbro:patch-1

6 years agoMerge pull request #12676 from PWhiddy:patch-1
Alexander Alekhin [Sat, 29 Sep 2018 13:02:33 +0000 (16:02 +0300)]
Merge pull request #12676 from PWhiddy:patch-1

6 years agoMerge pull request #12661 from Slyce-Inc:fix-xcode10-bitcode
Alexander Alekhin [Sat, 29 Sep 2018 12:50:51 +0000 (12:50 +0000)]
Merge pull request #12661 from Slyce-Inc:fix-xcode10-bitcode

6 years agoMerge pull request #12576 from cv3d:fix/cuda/polar_to_cart
Alexander Alekhin [Sat, 29 Sep 2018 12:45:47 +0000 (12:45 +0000)]
Merge pull request #12576 from cv3d:fix/cuda/polar_to_cart

6 years agofix typo in FpsMeter.java
soonbro [Fri, 28 Sep 2018 10:13:39 +0000 (19:13 +0900)]
fix typo in FpsMeter.java

'mFramesCouner' -> 'mFramesCounter'

6 years agoMerge pull request #12659 from dkurt:js_features2d
Alexander Alekhin [Fri, 28 Sep 2018 16:18:09 +0000 (16:18 +0000)]
Merge pull request #12659 from dkurt:js_features2d

6 years agoMerge pull request #12630 from alalek:docs_blacklist_matlab
Alexander Alekhin [Fri, 28 Sep 2018 16:15:19 +0000 (16:15 +0000)]
Merge pull request #12630 from alalek:docs_blacklist_matlab

6 years agoFix Xcode version parsing error (affects bitcode generation)
Andrew Mroczkowski [Wed, 26 Sep 2018 21:20:37 +0000 (17:20 -0400)]
Fix Xcode version parsing error (affects bitcode generation)

The regex was only parsing for a single digit in the major version, causing Xcode 10 to be treated as version "1". Other parts of the script only turn on bitcode generation if the Xcode version is > 7.

6 years agoMerge pull request #12657 from alalek:docs_repair_cuda_section
Alexander Alekhin [Fri, 28 Sep 2018 09:45:49 +0000 (09:45 +0000)]
Merge pull request #12657 from alalek:docs_repair_cuda_section

6 years agoJavaScript bindings for features2d module
Dmitry Kurtaev [Wed, 26 Sep 2018 16:11:40 +0000 (19:11 +0300)]
JavaScript bindings for features2d module

6 years agoFix typo "wit" -> "with"
Peter Whidden [Thu, 27 Sep 2018 21:37:59 +0000 (14:37 -0700)]
Fix typo "wit" -> "with"

6 years agoMerge pull request #12660 from alalek:flann_drop_useless_mutex
Alexander Alekhin [Thu, 27 Sep 2018 19:46:59 +0000 (19:46 +0000)]
Merge pull request #12660 from alalek:flann_drop_useless_mutex

6 years agoMerge pull request #12637 from savuor:fix/instr_ipp_ocl
Rostislav Vasilikhin [Thu, 27 Sep 2018 19:39:06 +0000 (22:39 +0300)]
Merge pull request #12637 from savuor:fix/instr_ipp_ocl

Fixes for instrumentation of IPP and OCL (#12637)

* fixed warning about re-declaring variable when both IPP and instrumentation are enabled

* fixed segfault when no funName provided

* compilation fixed when both OCL and instrumentation are enabled

6 years agoMerge pull request #12671 from alalek:fix_build_warnings_3.4
Alexander Alekhin [Thu, 27 Sep 2018 16:23:05 +0000 (16:23 +0000)]
Merge pull request #12671 from alalek:fix_build_warnings_3.4

6 years agoMerge pull request #12568 from sturkmen72:patch-3
Alexander Alekhin [Thu, 27 Sep 2018 13:42:44 +0000 (13:42 +0000)]
Merge pull request #12568 from sturkmen72:patch-3

6 years agofix build warnings
Alexander Alekhin [Thu, 27 Sep 2018 13:31:31 +0000 (16:31 +0300)]
fix build warnings

6 years agoMerge pull request #12650 from alalek:dnn_ocl4dnn_verification_test
Alexander Alekhin [Thu, 27 Sep 2018 09:54:23 +0000 (12:54 +0300)]
Merge pull request #12650 from alalek:dnn_ocl4dnn_verification_test

* dnn(ocl4dnn): update kernel checks

* dnn: workaround for IDLF kernels on Intel iGPU

* dnn(test): remove "skip" check for unstable cases

6 years agoflann: drop useless mutex
Alexander Alekhin [Wed, 26 Sep 2018 16:37:44 +0000 (19:37 +0300)]
flann: drop useless mutex

6 years agoMerge pull request #12647 from alalek:cmake_js_cleanup
Alexander Alekhin [Wed, 26 Sep 2018 15:53:02 +0000 (18:53 +0300)]
Merge pull request #12647 from alalek:cmake_js_cleanup

* cmake: js cleanup

- avoid unnecessary 2 messages for other platforms
- drop MODULE_NAME variable

* js: cleanup build_js.py

6 years agoMerge pull request #12548 from alalek:videoio_backend_name
Vadim Pisarevsky [Wed, 26 Sep 2018 15:19:55 +0000 (15:19 +0000)]
Merge pull request #12548 from alalek:videoio_backend_name

6 years agoMerge pull request #12565 from dkurt:dnn_non_intel_gpu
Dmitry Kurtaev [Wed, 26 Sep 2018 13:27:00 +0000 (16:27 +0300)]
Merge pull request #12565 from dkurt:dnn_non_intel_gpu

* Remove isIntel check from deep learning layers

* Remove fp16->fp32 fallbacks where it's not necessary

* Fix Kernel::run to prevent localsize > globalsize

6 years agoFix #12542 (#12603)
Dmitry Kurtaev [Wed, 26 Sep 2018 13:08:51 +0000 (16:08 +0300)]
Fix #12542 (#12603)

* Fix #12542

* Remove ignore of non-virtual-dtor error