platform/upstream/opencv.git
6 years agoMerge pull request #12006 from mshabunin:static-debug-assert
Alexander Alekhin [Thu, 19 Jul 2018 09:36:36 +0000 (09:36 +0000)]
Merge pull request #12006 from mshabunin:static-debug-assert

6 years agoEnable debug assertions for static analysis builds
Maksim Shabunin [Wed, 18 Jul 2018 12:53:16 +0000 (15:53 +0300)]
Enable debug assertions for static analysis builds

6 years agoMerge pull request #12000 from tomoaki0705:fixVS2013noexcept
Alexander Alekhin [Wed, 18 Jul 2018 11:43:23 +0000 (11:43 +0000)]
Merge pull request #12000 from tomoaki0705:fixVS2013noexcept

6 years agofix build error on Visual Studio 2013 and earlier
Tomoaki Teshima [Wed, 18 Jul 2018 07:08:52 +0000 (16:08 +0900)]
fix build error on Visual Studio 2013 and earlier

6 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 17 Jul 2018 16:26:50 +0000 (19:26 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

6 years agoMerge pull request #11104 from asciian:reading_from_stream
Alexander Alekhin [Tue, 17 Jul 2018 16:24:05 +0000 (16:24 +0000)]
Merge pull request #11104 from asciian:reading_from_stream

6 years agoMerge pull request #11986 from alalek:build_eliminate_gcc8_warnings
Alexander Alekhin [Tue, 17 Jul 2018 15:41:36 +0000 (15:41 +0000)]
Merge pull request #11986 from alalek:build_eliminate_gcc8_warnings

6 years agoMerge pull request #11984 from mshabunin:fix-static-1
Alexander Alekhin [Tue, 17 Jul 2018 15:40:48 +0000 (15:40 +0000)]
Merge pull request #11984 from mshabunin:fix-static-1

6 years agoMerge pull request #11968 from allnes:detect_qr_code
Alexander Alekhin [Tue, 17 Jul 2018 15:38:46 +0000 (15:38 +0000)]
Merge pull request #11968 from allnes:detect_qr_code

6 years agoMerge pull request #11964 from mshabunin:avi-container-fixes
Alexander Alekhin [Tue, 17 Jul 2018 15:35:07 +0000 (15:35 +0000)]
Merge pull request #11964 from mshabunin:avi-container-fixes

6 years agoMerge pull request #11990 from alalek:clone_nodiscard_attribute
Alexander Alekhin [Tue, 17 Jul 2018 15:34:08 +0000 (15:34 +0000)]
Merge pull request #11990 from alalek:clone_nodiscard_attribute

6 years agoMerge pull request #11994 from alalek:cmake_find_package_inference_engine
Alexander Alekhin [Tue, 17 Jul 2018 15:14:41 +0000 (15:14 +0000)]
Merge pull request #11994 from alalek:cmake_find_package_inference_engine

6 years agoCheck for empty Mat in compare, operator= and RNG::fill, fixed related tests
Maksim Shabunin [Tue, 17 Jul 2018 14:50:50 +0000 (17:50 +0300)]
Check for empty Mat in compare, operator= and RNG::fill, fixed related tests

6 years agoFixed issues found by static analysis (mostly DBZ)
Maksim Shabunin [Tue, 17 Jul 2018 13:14:54 +0000 (16:14 +0300)]
Fixed issues found by static analysis (mostly DBZ)

6 years agocmake: prefer using find_package(InferenceEngine)
Alexander Alekhin [Tue, 17 Jul 2018 12:30:56 +0000 (15:30 +0300)]
cmake: prefer using find_package(InferenceEngine)

6 years agoMerge pull request #11959 from pengli:3.4
Alexander Alekhin [Tue, 17 Jul 2018 11:20:02 +0000 (11:20 +0000)]
Merge pull request #11959 from pengli:3.4

6 years agoAdd Java overloads for each default argument (#11940)
Dmitry Kurtaev [Tue, 17 Jul 2018 10:41:46 +0000 (13:41 +0300)]
Add Java overloads for each default argument (#11940)

* Add Java overloads for each default argument

* Add "fisheye_" prefix for cv::fisheye:: functions and enums

6 years agocore: FileStorage - add support for writing vector<String> with bindings (#11883)
Pavel Rojtberg [Tue, 17 Jul 2018 10:38:48 +0000 (12:38 +0200)]
core: FileStorage - add support for writing vector<String> with bindings (#11883)

* core: FileStorage - add support for writing vector<String> with bindings

* python: extend persistence test for string sequences

6 years agoMerge pull request #11989 from csukuangfj:patch_2
Alexander Alekhin [Tue, 17 Jul 2018 10:27:21 +0000 (10:27 +0000)]
Merge pull request #11989 from csukuangfj:patch_2

6 years agoenable concat layer fuse for OCL target
Li Peng [Thu, 12 Jul 2018 07:16:32 +0000 (15:16 +0800)]
enable concat layer fuse for OCL target

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoWide univ intrinsics (#11953)
Vadim Pisarevsky [Mon, 16 Jul 2018 15:57:24 +0000 (18:57 +0300)]
Wide univ intrinsics (#11953)

* core:OE-27 prepare universal intrinsics to expand (#11022)

* core:OE-27 prepare universal intrinsics to expand (#11022)

* core: Add universal intrinsics for AVX2

* updated implementation of wide univ. intrinsics; converted several OpenCV HAL functions: sqrt, invsqrt, magnitude, phase, exp to the wide universal intrinsics.

* converted log to universal intrinsics; cleaned up the code a bit; added v_lut_deinterleave intrinsics.

* core: Add universal intrinsics for AVX2

* fixed multiple compile errors

* fixed many more compile errors and hopefully some test failures

* fixed some more compile errors

* temporarily disabled IPP to debug exp & log; hopefully fixed Doxygen complains

* fixed some more compile errors

* fixed v_store(short*, v_float16&) signatures

* trying to fix the test failures on Linux

* fixed some issues found by alalek

* restored IPP optimization after the patch with AVX wide intrinsics has been properly tested

* restored IPP optimization after the patch with AVX wide intrinsics has been properly tested

6 years agoMerge pull request #11957 from alalek:issue_11956
Alexander Alekhin [Mon, 16 Jul 2018 15:54:34 +0000 (15:54 +0000)]
Merge pull request #11957 from alalek:issue_11956

6 years agoMerge pull request #11970 from dkurt:dnn_enable_tf_tests
Alexander Alekhin [Mon, 16 Jul 2018 15:51:26 +0000 (15:51 +0000)]
Merge pull request #11970 from dkurt:dnn_enable_tf_tests

6 years agoMerge pull request #11985 from alalek:cmake_update_inference_engine_detection
Alexander Alekhin [Mon, 16 Jul 2018 15:49:19 +0000 (15:49 +0000)]
Merge pull request #11985 from alalek:cmake_update_inference_engine_detection

6 years agocore: CV_NODISCARD macro with semantic of [[nodiscard]] attr
Alexander Alekhin [Mon, 16 Jul 2018 14:59:24 +0000 (17:59 +0300)]
core: CV_NODISCARD macro with semantic of [[nodiscard]] attr

[[nodiscard]] is defined in C++17.
There is fallback alias for modern GCC / Clang compilers.

6 years agoremove a useless statement.
Kuang Fangjun [Sat, 14 Jul 2018 08:14:35 +0000 (16:14 +0800)]
remove a useless statement.

6 years agobuild: eliminate GCC8 warnings
Alexander Alekhin [Mon, 16 Jul 2018 12:34:59 +0000 (15:34 +0300)]
build: eliminate GCC8 warnings

6 years agoMerge pull request #11969 from alalek:core_Matx_inv_solve_templates
Alexander Alekhin [Mon, 16 Jul 2018 14:18:12 +0000 (14:18 +0000)]
Merge pull request #11969 from alalek:core_Matx_inv_solve_templates

6 years agoMerge pull request #11951 from alalek:cuda_use_external_cmake_module
Alexander Alekhin [Mon, 16 Jul 2018 13:41:45 +0000 (13:41 +0000)]
Merge pull request #11951 from alalek:cuda_use_external_cmake_module

6 years agoMerge pull request #11963 from dkurt:dnn_cl_fix_matmul
Alexander Alekhin [Mon, 16 Jul 2018 11:10:32 +0000 (11:10 +0000)]
Merge pull request #11963 from dkurt:dnn_cl_fix_matmul

6 years agocmake: update DL IE detection to align with OpenVINO 2018 R2
Alexander Alekhin [Mon, 16 Jul 2018 10:58:59 +0000 (13:58 +0300)]
cmake: update DL IE detection to align with OpenVINO 2018 R2

These CMake options are enough:
- `-DWITH_INF_ENGINE=ON`
- `-DIE_PLUGINS_PATH=lib/ubuntu_16.04/intel64`
- `-DENABLE_CXX11=ON` (OpenCV 3.4 only)

6 years agoAVI container: use C++ streams for file operations, check some operations for overflow
Maksim Shabunin [Fri, 13 Jul 2018 11:07:30 +0000 (14:07 +0300)]
AVI container: use C++ streams for file operations, check some operations for overflow

6 years agoMerge pull request #11965 from alalek:issue_11944
Alexander Alekhin [Mon, 16 Jul 2018 09:48:33 +0000 (09:48 +0000)]
Merge pull request #11965 from alalek:issue_11944

6 years agoMerge pull request #11967 from catree:add_tutorial_ml_java_python
Alexander Alekhin [Mon, 16 Jul 2018 09:24:32 +0000 (09:24 +0000)]
Merge pull request #11967 from catree:add_tutorial_ml_java_python

6 years agoMerge pull request #11971 from csukuangfj:patch_1
Alexander Alekhin [Sun, 15 Jul 2018 15:06:16 +0000 (15:06 +0000)]
Merge pull request #11971 from csukuangfj:patch_1

6 years agoMerge pull request #11980 from berak:core_lda_dataAsRow
Alexander Alekhin [Sun, 15 Jul 2018 14:32:15 +0000 (14:32 +0000)]
Merge pull request #11980 from berak:core_lda_dataAsRow

6 years agocore: remove unused dataAsRow flag from LDA
berak [Sun, 15 Jul 2018 09:32:00 +0000 (11:32 +0200)]
core: remove unused dataAsRow flag from LDA

6 years agoUpdate qrcode algorithm: fix seg. fault with kmeans
Alexander Nesterov [Fri, 13 Jul 2018 21:51:04 +0000 (18:51 -0300)]
Update qrcode algorithm: fix seg. fault with kmeans

6 years agoavoid negative index.
Kuang Fangjun [Sat, 14 Jul 2018 08:05:29 +0000 (16:05 +0800)]
avoid negative index.

6 years agocore: eliminate 'if' logic from Matx::inv()/solve()
Alexander Alekhin [Fri, 13 Jul 2018 15:52:20 +0000 (18:52 +0300)]
core: eliminate 'if' logic from Matx::inv()/solve()

- 'if' logic is moved into templates.
- removed unnecessary cv::Mat objects creation.
- fixed inv() test (invA * A == eye)
- added more Matx tests to cover all defined template specializations

6 years agoEnable TensorFlow networks tests for different backends and targets
Dmitry Kurtaev [Fri, 13 Jul 2018 16:47:50 +0000 (19:47 +0300)]
Enable TensorFlow networks tests for different backends and targets

6 years agoMerge pull request #11955 from terfendail:matx_solve_fix2
Alexander Alekhin [Fri, 13 Jul 2018 15:15:03 +0000 (15:15 +0000)]
Merge pull request #11955 from terfendail:matx_solve_fix2

6 years agoMerge pull request #11921 from allnes:detect_qr_code
Vadim Pisarevsky [Fri, 13 Jul 2018 14:26:17 +0000 (14:26 +0000)]
Merge pull request #11921 from allnes:detect_qr_code

6 years agoMerge pull request #11966 from alalek:core_solve_method_check
Alexander Alekhin [Fri, 13 Jul 2018 14:25:42 +0000 (14:25 +0000)]
Merge pull request #11966 from alalek:core_solve_method_check

6 years agoAdd Java and Python code for ML tutorials.
catree [Fri, 13 Jul 2018 13:11:00 +0000 (15:11 +0200)]
Add Java and Python code for ML tutorials.

6 years agoFix fully-connected layer in case of number of rows less than 4
Dmitry Kurtaev [Fri, 13 Jul 2018 10:23:45 +0000 (13:23 +0300)]
Fix fully-connected layer in case of number of rows less than 4

6 years agoAdd overloaded cv::PCACompute() that returns also the eigenvalues. Useful for Java...
catree [Fri, 13 Jul 2018 13:05:54 +0000 (15:05 +0200)]
Add overloaded cv::PCACompute() that returns also the eigenvalues. Useful for Java and Python OpenCV where PCA is not available.

6 years agoimgproc(getPerspectiveTransform): add configuration parameter
Alexander Alekhin [Fri, 13 Jul 2018 11:57:46 +0000 (14:57 +0300)]
imgproc(getPerspectiveTransform): add configuration parameter

6 years agoimgproc(getPerspectiveTransform): solve(DECOMP_SVD -> LU)
Alexander Alekhin [Fri, 13 Jul 2018 11:39:32 +0000 (14:39 +0300)]
imgproc(getPerspectiveTransform): solve(DECOMP_SVD -> LU)

6 years agoimgproc(perf): update getPerspectiveTransform perf test
Alexander Alekhin [Fri, 13 Jul 2018 11:34:46 +0000 (14:34 +0300)]
imgproc(perf): update getPerspectiveTransform perf test

Function is very fast, so 0.000 ms results are useless.
1000 runs requires 25ms on i7-6700K.

6 years agoMerge pull request #11960 from dkurt:dnn_cl_clip_kernel
Alexander Alekhin [Fri, 13 Jul 2018 12:29:47 +0000 (12:29 +0000)]
Merge pull request #11960 from dkurt:dnn_cl_clip_kernel

6 years agocore: solve(): add check for passed 'method' values
Alexander Alekhin [Fri, 13 Jul 2018 12:11:57 +0000 (15:11 +0300)]
core: solve(): add check for passed 'method' values

6 years agoClip kernel for OpenCL PriorBox layer
Dmitry Kurtaev [Fri, 13 Jul 2018 07:48:31 +0000 (10:48 +0300)]
Clip kernel for OpenCL PriorBox layer

6 years agoUpdate detect QRCode algorithm
Alexander Nesterov [Tue, 10 Jul 2018 17:24:09 +0000 (14:24 -0300)]
Update detect QRCode algorithm

6 years agocore: use "explicit" for Matx() ctor
Alexander Alekhin [Thu, 12 Jul 2018 17:14:23 +0000 (20:14 +0300)]
core: use "explicit" for Matx() ctor

6 years agoFixed unreachable code warnings for Matx::solve()
Vitaly Tuzov [Thu, 12 Jul 2018 16:19:51 +0000 (19:19 +0300)]
Fixed unreachable code warnings for Matx::solve()

6 years agoCUDA: allow to use external FindCUDA from modern CMake
Alexander Alekhin [Wed, 11 Jul 2018 10:47:56 +0000 (13:47 +0300)]
CUDA: allow to use external FindCUDA from modern CMake

CMake 3.9.0+ is required

6 years agoMerge pull request #11949 from berak:dnn_object_detection_typo
Alexander Alekhin [Thu, 12 Jul 2018 09:48:08 +0000 (09:48 +0000)]
Merge pull request #11949 from berak:dnn_object_detection_typo

6 years agodnn: fix typo in object_detection.cpp sample
berak [Thu, 12 Jul 2018 09:06:53 +0000 (11:06 +0200)]
dnn: fix typo in object_detection.cpp sample

6 years agoMerge pull request #11941 from alalek:dnn_ocl_fix_verify_umat_mapping
Alexander Alekhin [Thu, 12 Jul 2018 07:37:55 +0000 (07:37 +0000)]
Merge pull request #11941 from alalek:dnn_ocl_fix_verify_umat_mapping

6 years agoMerge pull request #11942 from catree:add_tutorial_core_java_python
Alexander Alekhin [Wed, 11 Jul 2018 20:27:17 +0000 (20:27 +0000)]
Merge pull request #11942 from catree:add_tutorial_core_java_python

6 years agoMerge pull request #11904 from terfendail/matx_solve_fix
Vitaly Tuzov [Wed, 11 Jul 2018 19:00:57 +0000 (22:00 +0300)]
Merge pull request #11904 from terfendail/matx_solve_fix

Fixed Matx::solve function for non-square matrixes (#11904)

6 years agoAdd Java and Python code for the following tutorials:
catree [Wed, 11 Jul 2018 17:38:16 +0000 (19:38 +0200)]
Add Java and Python code for the following tutorials:
      - Changing the contrast and brightness of an image!
      - Operations with images

6 years agodnn(ocl): fix wrong usage of stalled .getMat() pointers
Alexander Alekhin [Wed, 11 Jul 2018 16:11:36 +0000 (19:11 +0300)]
dnn(ocl): fix wrong usage of stalled .getMat() pointers

Temporary object lifetime must be greater than pointer usage.

6 years agoReplace std::vector<char> to std::vector<uchar> for Java bindings of dnn importers
Dmitry Kurtaev [Wed, 11 Jul 2018 09:48:34 +0000 (12:48 +0300)]
Replace std::vector<char> to std::vector<uchar> for Java bindings of dnn importers

6 years agoMerge pull request #11936 from berak:dnn_shufflelayer_name
Alexander Alekhin [Wed, 11 Jul 2018 12:01:31 +0000 (12:01 +0000)]
Merge pull request #11936 from berak:dnn_shufflelayer_name

6 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 11 Jul 2018 09:35:10 +0000 (12:35 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

6 years agoMerge pull request #11927 from pengli:3.4
Alexander Alekhin [Wed, 11 Jul 2018 09:33:24 +0000 (09:33 +0000)]
Merge pull request #11927 from pengli:3.4

6 years agoFix gemmlike convolution input reading
Li Peng [Tue, 10 Jul 2018 04:43:03 +0000 (12:43 +0800)]
Fix gemmlike convolution input reading

use vload3 for half3 or float3 input vector reading,
also check read position to see if it exceed input width

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agodnn: preserve name, type strings for ShuffleLayer
berak [Wed, 11 Jul 2018 06:19:23 +0000 (08:19 +0200)]
dnn: preserve name, type strings for ShuffleLayer

6 years agoMerge pull request #11931 from catree:add_doc_eye_ones
Alexander Alekhin [Tue, 10 Jul 2018 15:43:32 +0000 (15:43 +0000)]
Merge pull request #11931 from catree:add_doc_eye_ones

6 years agoMerge pull request #11929 from alalek:dnn_test_drop_enums
Alexander Alekhin [Tue, 10 Jul 2018 15:31:51 +0000 (15:31 +0000)]
Merge pull request #11929 from alalek:dnn_test_drop_enums

6 years agoAdd a note in the documentation about Mat::ones and mat::eye. With multi-channels...
catree [Tue, 10 Jul 2018 13:35:46 +0000 (15:35 +0200)]
Add a note in the documentation about Mat::ones and mat::eye. With multi-channels type (e.g. CV_8UC3), only the first channel is treated.

6 years agodnn(test): drop CV_ENUM for DNNBackend / DNNTarget
Alexander Alekhin [Tue, 10 Jul 2018 12:00:42 +0000 (15:00 +0300)]
dnn(test): drop CV_ENUM for DNNBackend / DNNTarget

6 years agoAdd readNet* functions which parse models from byte arrays
Dmitry Kurtaev [Wed, 4 Jul 2018 15:15:31 +0000 (18:15 +0300)]
Add readNet* functions which parse models from byte arrays

6 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 9 Jul 2018 16:31:45 +0000 (19:31 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

6 years agoMerge pull request #11924 from alalek:dnn_ocl_fix_max_pool_forward
Alexander Alekhin [Mon, 9 Jul 2018 16:25:34 +0000 (16:25 +0000)]
Merge pull request #11924 from alalek:dnn_ocl_fix_max_pool_forward

6 years agoMerge pull request #11923 from alalek:dnn_external_protobuf
Alexander Alekhin [Mon, 9 Jul 2018 16:07:41 +0000 (16:07 +0000)]
Merge pull request #11923 from alalek:dnn_external_protobuf

6 years agoMerge pull request #11922 from alalek:dnn_test_myriad_check
Alexander Alekhin [Mon, 9 Jul 2018 16:07:18 +0000 (16:07 +0000)]
Merge pull request #11922 from alalek:dnn_test_myriad_check

6 years agoMerge pull request #11703 from alalek:c_api_calib3d_chessboard_detector
Alexander Alekhin [Mon, 9 Jul 2018 15:37:26 +0000 (15:37 +0000)]
Merge pull request #11703 from alalek:c_api_calib3d_chessboard_detector

6 years agodnn(ocl4dnn): fix args for 'max_pool_forward' kernel
Alexander Alekhin [Mon, 9 Jul 2018 15:02:20 +0000 (18:02 +0300)]
dnn(ocl4dnn): fix args for 'max_pool_forward' kernel

6 years agoMerge pull request #11903 from alalek:issue_9002
Alexander Alekhin [Mon, 9 Jul 2018 14:49:37 +0000 (14:49 +0000)]
Merge pull request #11903 from alalek:issue_9002

6 years agodnn: allow to use external protobuf
Alexander Alekhin [Mon, 9 Jul 2018 14:19:35 +0000 (17:19 +0300)]
dnn: allow to use external protobuf

"custom layers" feature will not work properly in these builds.

6 years agoMerge pull request #11919 from dkurt:dnn_replace_convert_fp16
Alexander Alekhin [Mon, 9 Jul 2018 14:07:37 +0000 (14:07 +0000)]
Merge pull request #11919 from dkurt:dnn_replace_convert_fp16

6 years agodnn(test): use checkMyriadTarget() in Test_Caffe_layers.Conv_Elu test
Alexander Alekhin [Mon, 9 Jul 2018 13:20:46 +0000 (16:20 +0300)]
dnn(test): use checkMyriadTarget() in Test_Caffe_layers.Conv_Elu test

6 years agoReplace convertFp16 from dnn::Net::setInput()
Dmitry Kurtaev [Mon, 9 Jul 2018 11:35:54 +0000 (14:35 +0300)]
Replace convertFp16 from dnn::Net::setInput()

6 years agoMerge pull request #11906 from berak:fix_qrcode
Alexander Alekhin [Mon, 9 Jul 2018 09:36:40 +0000 (09:36 +0000)]
Merge pull request #11906 from berak:fix_qrcode

6 years agoReading net from std::ifstream
asciian [Sun, 18 Mar 2018 02:21:58 +0000 (11:21 +0900)]
Reading net from std::ifstream

Remove some assertions

Replace std::ifstream to std::istream

Add test for new importer

Remove constructor to load file

Rename cfgStream and darknetModelStream to ifile

Add error notification to inform pathname to user

Use FileStorage instead of std::istream

Use FileNode instead of FileStorage

Fix typo

6 years agoMerge pull request #11911 from berak:core_fix_autobuffer_opengl
Alexander Alekhin [Sun, 8 Jul 2018 13:50:35 +0000 (13:50 +0000)]
Merge pull request #11911 from berak:core_fix_autobuffer_opengl

6 years agocore: fix autobuffer usage in opengl.cpp
berak [Sun, 8 Jul 2018 07:51:06 +0000 (09:51 +0200)]
core: fix autobuffer usage in opengl.cpp

6 years agoobjdetect: validate input in qrcode
berak [Sat, 7 Jul 2018 14:56:40 +0000 (16:56 +0200)]
objdetect: validate input in qrcode

6 years agoMerge pull request #11899 from arnaudbrejeon:moveable_types
Arnaud Brejeon [Fri, 6 Jul 2018 20:36:08 +0000 (13:36 -0700)]
Merge pull request #11899 from arnaudbrejeon:moveable_types

Add missing constructors and operator= (#11899)

6 years agohighgui(gtk): use recursive cv::Mutex for 'window_mutex' variable
Alexander Alekhin [Fri, 6 Jul 2018 14:06:01 +0000 (17:06 +0300)]
highgui(gtk): use recursive cv::Mutex for 'window_mutex' variable

6 years agohighgui: fix GTK issues with external UI thread
Alexander Alekhin [Fri, 6 Jul 2018 13:17:49 +0000 (16:17 +0300)]
highgui: fix GTK issues with external UI thread

6 years agoMerge pull request #11901 from alalek:fix_cuda_build
Alexander Alekhin [Fri, 6 Jul 2018 14:07:50 +0000 (14:07 +0000)]
Merge pull request #11901 from alalek:fix_cuda_build

6 years agoMerge pull request #11867 from dkurt:dnn_ie_layers
Vadim Pisarevsky [Fri, 6 Jul 2018 13:13:20 +0000 (13:13 +0000)]
Merge pull request #11867 from dkurt:dnn_ie_layers

6 years agocuda: fix build
Alexander Alekhin [Fri, 6 Jul 2018 12:31:25 +0000 (15:31 +0300)]
cuda: fix build

use cv::AutoBuffer::data() to get data pointer

6 years agoMerge pull request #11895 from alalek:fix_fn_types
Alexander Alekhin [Fri, 6 Jul 2018 12:01:31 +0000 (12:01 +0000)]
Merge pull request #11895 from alalek:fix_fn_types

6 years agoMerge pull request #11900 from alalek:build_warnings
Alexander Alekhin [Fri, 6 Jul 2018 12:00:43 +0000 (12:00 +0000)]
Merge pull request #11900 from alalek:build_warnings

6 years agocore(hal): eliminate build warnings
Alexander Alekhin [Fri, 6 Jul 2018 09:41:59 +0000 (12:41 +0300)]
core(hal): eliminate build warnings