platform/upstream/opencv.git
6 years agoMerge pull request #11681 from alalek:fix_docs_bs4_spaces
Alexander Alekhin [Mon, 4 Jun 2018 16:15:45 +0000 (16:15 +0000)]
Merge pull request #11681 from alalek:fix_docs_bs4_spaces

6 years agoMerge pull request #11646 from alalek:gtest_support_params_from_anonymous_namespace
Alexander Alekhin [Mon, 4 Jun 2018 15:27:33 +0000 (15:27 +0000)]
Merge pull request #11646 from alalek:gtest_support_params_from_anonymous_namespace

6 years agoMerge pull request #11636 from alalek:cmake_ffmpeg_find_package
Alexander Alekhin [Mon, 4 Jun 2018 14:37:36 +0000 (14:37 +0000)]
Merge pull request #11636 from alalek:cmake_ffmpeg_find_package

6 years agodocs: preserve space symbols during bs4 processing
Alexander Alekhin [Mon, 4 Jun 2018 14:15:56 +0000 (17:15 +0300)]
docs: preserve space symbols during bs4 processing

6 years agoMerge pull request #11610 from savuor:fix/stereobm_simd_fixed_float
Rostislav Vasilikhin [Mon, 4 Jun 2018 13:03:12 +0000 (16:03 +0300)]
Merge pull request #11610 from savuor:fix/stereobm_simd_fixed_float

* StereoBM: fixed SIMD processing for fixed-type output arrays

* changed norm type and threshold, added assertion

* fixed disp_shift

6 years agogtest: support parameters with types from anonymous namespace
Alexander Alekhin [Thu, 31 May 2018 20:35:33 +0000 (20:35 +0000)]
gtest: support parameters with types from anonymous namespace

6 years agoMerge pull request #11654 from alalek:issue_11648
Vadim Pisarevsky [Mon, 4 Jun 2018 10:22:44 +0000 (10:22 +0000)]
Merge pull request #11654 from alalek:issue_11648

6 years agoMerge pull request #11644 from alalek:docs_avoid_master_links_in_3.4-2
Vadim Pisarevsky [Mon, 4 Jun 2018 10:19:44 +0000 (10:19 +0000)]
Merge pull request #11644 from alalek:docs_avoid_master_links_in_3.4-2

6 years agoMerge pull request #11670 from alalek:cmake_avoid_double_variable_expand
Vadim Pisarevsky [Mon, 4 Jun 2018 10:15:07 +0000 (10:15 +0000)]
Merge pull request #11670 from alalek:cmake_avoid_double_variable_expand

6 years agoMerge pull request #11671 from alalek:cmake_enable_pch_with_msvc_crosscompiling
Vadim Pisarevsky [Mon, 4 Jun 2018 10:13:59 +0000 (10:13 +0000)]
Merge pull request #11671 from alalek:cmake_enable_pch_with_msvc_crosscompiling

6 years agoMerge pull request #11657 from dkurt:dnn_ie_multiple_networks
Vadim Pisarevsky [Mon, 4 Jun 2018 10:12:46 +0000 (10:12 +0000)]
Merge pull request #11657 from dkurt:dnn_ie_multiple_networks

6 years agoMerge pull request #11678 from csukuangfj:fix-doc
Alexander Alekhin [Sun, 3 Jun 2018 11:00:38 +0000 (11:00 +0000)]
Merge pull request #11678 from csukuangfj:fix-doc

6 years agoMerge pull request #11674 from csukuangfj:fix-11673
Alexander Alekhin [Sun, 3 Jun 2018 11:00:10 +0000 (11:00 +0000)]
Merge pull request #11674 from csukuangfj:fix-11673

6 years agofix doc.
Kuang Fangjun [Sat, 2 Jun 2018 23:21:08 +0000 (07:21 +0800)]
fix doc.

6 years agofix #11673.
Kuang Fangjun [Sat, 2 Jun 2018 11:16:56 +0000 (19:16 +0800)]
fix #11673.

6 years agoMerge pull request #11647 from sanchom:3.4
Alexander Alekhin [Sat, 2 Jun 2018 20:52:17 +0000 (20:52 +0000)]
Merge pull request #11647 from sanchom:3.4

6 years agocmake: ENABLE_PRECOMPILED_HEADERS for MSVC cross-compiling
Alexander Alekhin [Sat, 2 Jun 2018 08:27:34 +0000 (08:27 +0000)]
cmake: ENABLE_PRECOMPILED_HEADERS for MSVC cross-compiling

MSVC ARM / WinRT builds

6 years agocmake: avoid double variable expand
Alexander Alekhin [Sat, 2 Jun 2018 08:16:31 +0000 (08:16 +0000)]
cmake: avoid double variable expand

6 years agoMerge pull request #11659 from take1014:snippet_11597
Alexander Alekhin [Fri, 1 Jun 2018 16:48:10 +0000 (16:48 +0000)]
Merge pull request #11659 from take1014:snippet_11597

6 years agoMerge pull request #11656 from pauljurczak:patch-1
Alexander Alekhin [Fri, 1 Jun 2018 16:39:54 +0000 (16:39 +0000)]
Merge pull request #11656 from pauljurczak:patch-1

6 years agoMerge pull request #11641 from alalek:videoio_test_fixup
Alexander Alekhin [Fri, 1 Jun 2018 16:39:11 +0000 (16:39 +0000)]
Merge pull request #11641 from alalek:videoio_test_fixup

6 years agoadd imgproc snippets
take1014 [Fri, 1 Jun 2018 14:42:00 +0000 (23:42 +0900)]
add imgproc snippets

6 years agoMerge pull request #11651 from vladkraievskiy:master
Alexander Alekhin [Fri, 1 Jun 2018 11:28:15 +0000 (11:28 +0000)]
Merge pull request #11651 from vladkraievskiy:master

6 years agoFix multiple networks with Intel's Inference Engine backend
Dmitry Kurtaev [Fri, 1 Jun 2018 11:10:32 +0000 (14:10 +0300)]
Fix multiple networks with Intel's Inference Engine backend

6 years agoconvertFp16 documentation edit (2)
Paul Jurczak [Fri, 1 Jun 2018 10:15:21 +0000 (04:15 -0600)]
convertFp16 documentation edit (2)

If this seems too wordy, take into account a new user who tries to find out extent of FP16 support in OpenCV.

6 years agoFixed a typo in android toolchain documentation.
Vlad Kraevskiy [Fri, 1 Jun 2018 08:38:47 +0000 (11:38 +0300)]
Fixed a typo in android toolchain documentation.

6 years agocore: drop unnecessary duplicate check
Alexander Alekhin [Fri, 1 Jun 2018 09:31:48 +0000 (12:31 +0300)]
core: drop unnecessary duplicate check

6 years agoRefactored out a dead code path.
Sancho McCann [Thu, 31 May 2018 21:09:26 +0000 (21:09 +0000)]
Refactored out a dead code path.

6 years agoMerge pull request #11642 from alalek:calib3d_chess_board_avoid_clone
Alexander Alekhin [Thu, 31 May 2018 19:17:48 +0000 (19:17 +0000)]
Merge pull request #11642 from alalek:calib3d_chess_board_avoid_clone

6 years agoHsv2rgb univ intrin (#11637)
Vadim Pisarevsky [Thu, 31 May 2018 18:59:45 +0000 (21:59 +0300)]
Hsv2rgb univ intrin (#11637)

* add universal intrinsics for HSV2RGB_b

* rewritten HSV2RGB_b without using extra universal intrinsics

* removed unused variable

* undo changes in v_load_deinterleave

6 years agoMerge pull request #11608 from take1014:hist_11544
Alexander Alekhin [Thu, 31 May 2018 16:44:02 +0000 (16:44 +0000)]
Merge pull request #11608 from take1014:hist_11544

6 years agoMerge pull request #11634 from vpisarev:empty_mat_with_types_2
Vadim Pisarevsky [Thu, 31 May 2018 16:36:39 +0000 (19:36 +0300)]
Merge pull request #11634 from vpisarev:empty_mat_with_types_2

fixes handling of empty matrices in some functions (#11634)

* a part of PR #11416 by Yuki Takehara

* moved the empty mat check in Mat::copyTo()

* fixed some test failures

6 years agoMerge pull request #11639 from alalek:fix_precomp_hpp
Alexander Alekhin [Thu, 31 May 2018 16:35:21 +0000 (16:35 +0000)]
Merge pull request #11639 from alalek:fix_precomp_hpp

6 years agocalib3d: cv::findContours() doesn't require to clone input
Alexander Alekhin [Thu, 31 May 2018 16:08:00 +0000 (19:08 +0300)]
calib3d: cv::findContours() doesn't require to clone input

6 years agodocumentation: avoid links to 'master' branch from 3.4 maintenance branch (2)
Alexander Alekhin [Thu, 31 May 2018 16:30:56 +0000 (19:30 +0300)]
documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)

Other links:
- https://raw.githubusercontent.com/opencv/opencv/master
- https://github.com/opencv/opencv/blob/master

6 years agoMerge pull request #11638 from alalek:docs_avoid_master_links_in_3.4
Alexander Alekhin [Thu, 31 May 2018 16:22:03 +0000 (16:22 +0000)]
Merge pull request #11638 from alalek:docs_avoid_master_links_in_3.4

6 years agovideoio(test): fixup information dump
Alexander Alekhin [Thu, 31 May 2018 15:54:43 +0000 (18:54 +0300)]
videoio(test): fixup information dump

6 years agocmake: support find_package(FFMPEG)
Alexander Alekhin [Thu, 31 May 2018 12:39:59 +0000 (15:39 +0300)]
cmake: support find_package(FFMPEG)

Use "OPENCV_FFMPEG_USE_FIND_PACKAGE" variable to specify find_package() parameters

6 years agoMerge pull request #11633 from alalek:issue_10546
Alexander Alekhin [Thu, 31 May 2018 15:08:45 +0000 (15:08 +0000)]
Merge pull request #11633 from alalek:issue_10546

6 years agoMerge pull request #11635 from dkurt:dnn_fix_ie_fused_layer_output
Vadim Pisarevsky [Thu, 31 May 2018 14:52:57 +0000 (14:52 +0000)]
Merge pull request #11635 from dkurt:dnn_fix_ie_fused_layer_output

6 years agoCorrect handling when IPP is enabled
take1014 [Thu, 31 May 2018 13:54:32 +0000 (22:54 +0900)]
Correct handling when IPP is enabled

6 years agofix missing precomp.hpp
Alexander Alekhin [Thu, 31 May 2018 13:53:44 +0000 (16:53 +0300)]
fix missing precomp.hpp

6 years agodocumentation: avoid links to 'master' branch from 3.4 maintenance branch
Alexander Alekhin [Thu, 31 May 2018 13:45:18 +0000 (16:45 +0300)]
documentation: avoid links to 'master' branch from 3.4 maintenance branch

6 years agoFix Inference Engine graphs with fused output layers
Dmitry Kurtaev [Thu, 31 May 2018 13:16:34 +0000 (16:16 +0300)]
Fix Inference Engine graphs with fused output layers

6 years agovideoio(v4l): eliminate global variable
Alexander Alekhin [Thu, 31 May 2018 11:11:47 +0000 (14:11 +0300)]
videoio(v4l): eliminate global variable

6 years agovideoio(v4l): don't pre-scan or cache list of available cameras
Alexander Alekhin [Thu, 31 May 2018 11:03:02 +0000 (14:03 +0300)]
videoio(v4l): don't pre-scan or cache list of available cameras

6 years agovideoio(v4l): fix code indentation, tabs
Alexander Alekhin [Thu, 31 May 2018 10:37:13 +0000 (13:37 +0300)]
videoio(v4l): fix code indentation, tabs

6 years agoMerge pull request #11632 from alalek:videoio_fixes
Alexander Alekhin [Thu, 31 May 2018 12:09:14 +0000 (12:09 +0000)]
Merge pull request #11632 from alalek:videoio_fixes

6 years agoMerge pull request #11627 from alalek:fix_python_cast_method_with_kw
Alexander Alekhin [Thu, 31 May 2018 11:38:39 +0000 (11:38 +0000)]
Merge pull request #11627 from alalek:fix_python_cast_method_with_kw

6 years agoMerge pull request #11255 from dkurt:dnn_tf_faster_rcnn
Vadim Pisarevsky [Thu, 31 May 2018 11:07:39 +0000 (11:07 +0000)]
Merge pull request #11255 from dkurt:dnn_tf_faster_rcnn

6 years agovideoio: fix isOpened() method for legacy APIs, fix "index" API list
Alexander Alekhin [Thu, 31 May 2018 11:07:22 +0000 (14:07 +0300)]
videoio: fix isOpened() method for legacy APIs, fix "index" API list

6 years agoUpdate Intel's Inference Engine deep learning backend (#11587)
Dmitry Kurtaev [Thu, 31 May 2018 11:05:21 +0000 (14:05 +0300)]
Update Intel's Inference Engine deep learning backend (#11587)

* Update Intel's Inference Engine deep learning backend

* Remove cpu_extension dependency

* Update Darknet accuracy tests

6 years agoMerge pull request #11631 from sparkecho:3.4
Spark Echo [Thu, 31 May 2018 07:23:19 +0000 (15:23 +0800)]
Merge pull request #11631 from sparkecho:3.4

Typo fixes (#11631)

6 years agoMerge pull request #11618 from alalek:ffmpeg_debug_log
Alexander Alekhin [Wed, 30 May 2018 15:36:42 +0000 (15:36 +0000)]
Merge pull request #11618 from alalek:ffmpeg_debug_log

6 years agoMerge pull request #11601 from alalek:calib3d_replace_findContours
Alexander Alekhin [Wed, 30 May 2018 15:35:49 +0000 (15:35 +0000)]
Merge pull request #11601 from alalek:calib3d_replace_findContours

6 years agopython: fix arg types of cv2_UMatWrapperObject functions
Alexander Alekhin [Wed, 30 May 2018 15:07:03 +0000 (18:07 +0300)]
python: fix arg types of cv2_UMatWrapperObject functions

6 years agopython: avoid direct cast PyCFunctionWithKeywords->PyCFunction
Alexander Alekhin [Wed, 30 May 2018 14:24:43 +0000 (17:24 +0300)]
python: avoid direct cast PyCFunctionWithKeywords->PyCFunction

6 years agoFaster-RCNN object detection models from TensorFlow
Dmitry Kurtaev [Tue, 3 Apr 2018 15:28:05 +0000 (18:28 +0300)]
Faster-RCNN object detection models from TensorFlow

6 years agoMerge pull request #11557 from tomoaki0705:relaxIntelOnlyOCL4DNN
Alexander Alekhin [Tue, 29 May 2018 15:25:22 +0000 (15:25 +0000)]
Merge pull request #11557 from tomoaki0705:relaxIntelOnlyOCL4DNN

6 years agoMerge pull request #11614 from dkurt:dnn_fix_keras_dilated_conv
Alexander Alekhin [Tue, 29 May 2018 15:21:30 +0000 (15:21 +0000)]
Merge pull request #11614 from dkurt:dnn_fix_keras_dilated_conv

6 years agoMerge pull request #11617 from alalek:ffmpeg_fix_time_base
Alexander Alekhin [Tue, 29 May 2018 15:19:13 +0000 (15:19 +0000)]
Merge pull request #11617 from alalek:ffmpeg_fix_time_base

6 years agoMerge pull request #11598 from catree:add_tutorial_features2d_java_python
Alexander Alekhin [Tue, 29 May 2018 15:18:44 +0000 (15:18 +0000)]
Merge pull request #11598 from catree:add_tutorial_features2d_java_python

6 years agoMerge pull request #11596 from alalek:videoio_priority_list
Alexander Alekhin [Tue, 29 May 2018 15:17:01 +0000 (15:17 +0000)]
Merge pull request #11596 from alalek:videoio_priority_list

6 years agocalib3d: chess board - replace to cv::findContours()
Alexander Alekhin [Mon, 28 May 2018 09:19:06 +0000 (12:19 +0300)]
calib3d: chess board - replace to cv::findContours()

6 years agovideoio(ffmpeg): add option to enable debug logs
Alexander Alekhin [Tue, 29 May 2018 12:40:52 +0000 (12:40 +0000)]
videoio(ffmpeg): add option to enable debug logs

6 years agovideoio: backends priority list
Alexander Alekhin [Mon, 21 May 2018 14:06:31 +0000 (14:06 +0000)]
videoio: backends priority list

6 years agovideoio(ffmpeg): specify stream->time_base
Alexander Alekhin [Tue, 29 May 2018 11:28:38 +0000 (11:28 +0000)]
videoio(ffmpeg): specify stream->time_base

Using codec->time_base is deprecated to specify muxer settings.
Resolves issue with FPS value for AVI files with FFmpeg 4.0.

Related FFmpeg commits:
- https://github.com/FFmpeg/FFmpeg/commit/194be1f43ea391eb986732707435176e579265aa
- https://github.com/FFmpeg/FFmpeg/commit/91736025b2807995e29bd0661807c1c84f515fef

6 years agomake ocl4dnn available to run on other platform than Intel GPU
Tomoaki Teshima [Tue, 29 May 2018 10:18:10 +0000 (19:18 +0900)]
make ocl4dnn available to run on other platform than Intel GPU

6 years agoFix dilated convolution from Keras
Dmitry Kurtaev [Tue, 29 May 2018 09:15:47 +0000 (12:15 +0300)]
Fix dilated convolution from Keras

6 years agoAdd Java and Python code for the following features2d tutorials: Harris corner detect...
catree [Sun, 27 May 2018 23:33:56 +0000 (01:33 +0200)]
Add Java and Python code for the following features2d tutorials: Harris corner detector, Shi-Tomasi corner detector, Creating your own corner detector, Detecting corners location in subpixels, Feature Detection, Feature Description, Feature Matching with FLANN, Features2D + Homography to find a known object. Use Lowe's ratio test to filter the matches.

6 years agoMerge pull request #11607 from dkurt:dnn_scale_shift_layer
Alexander Alekhin [Mon, 28 May 2018 18:19:22 +0000 (18:19 +0000)]
Merge pull request #11607 from dkurt:dnn_scale_shift_layer

6 years agoMerge pull request #11605 from alalek:fix_build_10963
Alexander Alekhin [Mon, 28 May 2018 18:18:40 +0000 (18:18 +0000)]
Merge pull request #11605 from alalek:fix_build_10963

6 years agoRemove Shift deep learning layer
Dmitry Kurtaev [Mon, 28 May 2018 15:13:32 +0000 (18:13 +0300)]
Remove Shift deep learning layer

6 years agobuild: workaround issues with C compilation mode
Alexander Alekhin [Mon, 28 May 2018 15:07:23 +0000 (18:07 +0300)]
build: workaround issues with C compilation mode

- cvdef.h + cvRound (double only)
- highgui_c.h

6 years agoMerge pull request #11591 from alalek:calib3d_chessboard_fix3
Alexander Alekhin [Mon, 28 May 2018 12:48:10 +0000 (12:48 +0000)]
Merge pull request #11591 from alalek:calib3d_chessboard_fix3

6 years agoMerge pull request #11590 from alalek:calib3d_chessboard_fix2
Alexander Alekhin [Mon, 28 May 2018 12:44:46 +0000 (12:44 +0000)]
Merge pull request #11590 from alalek:calib3d_chessboard_fix2

6 years agoMerge pull request #11589 from alalek:calib3d_chessboard_fix
Alexander Alekhin [Mon, 28 May 2018 10:13:42 +0000 (10:13 +0000)]
Merge pull request #11589 from alalek:calib3d_chessboard_fix

6 years agoMerge pull request #11592 from catree:remove_java_toBufferedImage
Alexander Alekhin [Sat, 26 May 2018 17:29:48 +0000 (17:29 +0000)]
Merge pull request #11592 from catree:remove_java_toBufferedImage

6 years agoMerge pull request #11576 from alalek:avoid_copyTo_with_getMat
Alexander Alekhin [Fri, 25 May 2018 16:52:58 +0000 (16:52 +0000)]
Merge pull request #11576 from alalek:avoid_copyTo_with_getMat

6 years agoUse directly HighGui.toBufferedImage().
catree [Fri, 25 May 2018 14:23:42 +0000 (16:23 +0200)]
Use directly HighGui.toBufferedImage().

6 years agocalib3d: chess board - perform full range (with 0) histogram smooth
Alexander Alekhin [Fri, 25 May 2018 12:35:36 +0000 (15:35 +0300)]
calib3d: chess board - perform full range (with 0) histogram smooth

6 years agocalib3d: chess board - properly detect/handle iCntMaxima=0 case
Alexander Alekhin [Fri, 25 May 2018 12:09:36 +0000 (15:09 +0300)]
calib3d: chess board - properly detect/handle iCntMaxima=0 case

6 years agocalib3d: chess board - avoid image modification via cvFindContours
Alexander Alekhin [Fri, 25 May 2018 12:01:34 +0000 (15:01 +0300)]
calib3d: chess board - avoid image modification via cvFindContours

6 years agoMerge pull request #11396 from terfendail:msmf_icapture
Alexander Alekhin [Thu, 24 May 2018 18:30:09 +0000 (18:30 +0000)]
Merge pull request #11396 from terfendail:msmf_icapture

6 years agoMerge pull request #11580 from dkurt:dnn_fix_tf_ssd
Alexander Alekhin [Thu, 24 May 2018 18:28:41 +0000 (18:28 +0000)]
Merge pull request #11580 from dkurt:dnn_fix_tf_ssd

6 years agoMerge pull request #11583 from catree:add_tutorial_imgproc_java_python2
Alexander Alekhin [Thu, 24 May 2018 18:28:14 +0000 (18:28 +0000)]
Merge pull request #11583 from catree:add_tutorial_imgproc_java_python2

6 years agoAdd Java and Python code for the following imgproc tutorials: Affine Transformations...
catree [Wed, 23 May 2018 17:44:27 +0000 (19:44 +0200)]
Add Java and Python code for the following imgproc tutorials: Affine Transformations, Histogram Equalization, Histogram Calculation, Histogram Comparison, Back Projection.

6 years agoMerge pull request #11582 from alalek:use_mat_empty_instead_of_size
Alexander Alekhin [Wed, 23 May 2018 20:43:36 +0000 (20:43 +0000)]
Merge pull request #11582 from alalek:use_mat_empty_instead_of_size

6 years agoMerge pull request #11108 from take1014:hough_4303
yuki takehara [Wed, 23 May 2018 20:42:12 +0000 (05:42 +0900)]
Merge pull request #11108 from take1014:hough_4303

* Added accumulator value to the output of HoughLines and HoughCircles

* imgproc: refactor Hough patch

- eliminate code duplication
- fix type handling, fix OpenCL code
- fix test data generation
- re-generated test data in debug mode via plain CPU code path

6 years agoMerge pull request #11551 from take1014:filter2d_10683
yuki takehara [Wed, 23 May 2018 20:25:11 +0000 (05:25 +0900)]
Merge pull request #11551 from take1014:filter2d_10683

* Add arguments to dftFilter2D

* test: add expected test values

6 years agoMerge pull request #11581 from mdfirman:rectify3Collinear_bugfix
Alexander Alekhin [Wed, 23 May 2018 20:19:11 +0000 (20:19 +0000)]
Merge pull request #11581 from mdfirman:rectify3Collinear_bugfix

6 years agoMerge pull request #11567 from alalek:code_quality
Alexander Alekhin [Wed, 23 May 2018 15:47:11 +0000 (15:47 +0000)]
Merge pull request #11567 from alalek:code_quality

6 years agointeractive-calibration: use empty() method instead of checking dimension size
Alexander Alekhin [Wed, 23 May 2018 15:26:21 +0000 (18:26 +0300)]
interactive-calibration: use empty() method instead of checking dimension size

6 years agoBugfix to allow adjust3rdMatrix to be run
Michael Firman [Wed, 23 May 2018 15:03:21 +0000 (16:03 +0100)]
Bugfix to allow adjust3rdMatrix to be run

6 years agoMerge pull request #11578 from alalek:build_warnings
Alexander Alekhin [Wed, 23 May 2018 15:02:32 +0000 (15:02 +0000)]
Merge pull request #11578 from alalek:build_warnings

6 years agoMerge pull request #11573 from mshabunin:fix-gst-leak
Alexander Alekhin [Wed, 23 May 2018 15:00:37 +0000 (15:00 +0000)]
Merge pull request #11573 from mshabunin:fix-gst-leak

6 years agoMSMF-based VideoCapture and VideoWriter backend changed to C++ interface
Vitaly Tuzov [Wed, 25 Apr 2018 15:19:14 +0000 (18:19 +0300)]
MSMF-based VideoCapture and VideoWriter backend changed to C++ interface

6 years agoFix batch normalization fusion from TensorFlow's SSDs
Dmitry Kurtaev [Wed, 23 May 2018 13:49:31 +0000 (16:49 +0300)]
Fix batch normalization fusion from TensorFlow's SSDs

6 years agofix build warnings
Alexander Alekhin [Wed, 23 May 2018 13:04:41 +0000 (16:04 +0300)]
fix build warnings

6 years agoMerge pull request #11575 from mshabunin:fix-ie-win
Alexander Alekhin [Wed, 23 May 2018 13:00:23 +0000 (13:00 +0000)]
Merge pull request #11575 from mshabunin:fix-ie-win