platform/upstream/opencv.git
6 years agoMerge pull request #13005 from alalek:samples_gpu_drop_legacy
Alexander Alekhin [Tue, 6 Nov 2018 18:41:28 +0000 (18:41 +0000)]
Merge pull request #13005 from alalek:samples_gpu_drop_legacy

6 years agoMerge pull request #12999 from fegorsch:improve-circle-detector
Alexander Alekhin [Tue, 6 Nov 2018 18:40:55 +0000 (18:40 +0000)]
Merge pull request #12999 from fegorsch:improve-circle-detector

6 years agoMerge pull request #13045 from LaurentBerger:kmeansdoc
Alexander Alekhin [Tue, 6 Nov 2018 17:00:47 +0000 (20:00 +0300)]
Merge pull request #13045 from LaurentBerger:kmeansdoc

typo in kmeans doc

6 years agoMerge pull request #13040 from alalek:docs_cleanup_3.4
Alexander Alekhin [Tue, 6 Nov 2018 16:51:47 +0000 (19:51 +0300)]
Merge pull request #13040 from alalek:docs_cleanup_3.4

6 years agoMerge pull request #13053 from berak:highgui_win32_waitkey
Alexander Alekhin [Tue, 6 Nov 2018 16:18:11 +0000 (16:18 +0000)]
Merge pull request #13053 from berak:highgui_win32_waitkey

6 years agoMerge pull request #12916 from lqy123000:bugfix_templmatch
lqy123000 [Tue, 6 Nov 2018 16:13:48 +0000 (00:13 +0800)]
Merge pull request #12916 from lqy123000:bugfix_templmatch

* avoid rounding errors

* imgproc: replace condition in matchTemplate

6 years agoMerge pull request #13033 from alalek:videoio_fix_ffmpeg_3.4
Alexander Alekhin [Tue, 6 Nov 2018 15:56:57 +0000 (15:56 +0000)]
Merge pull request #13033 from alalek:videoio_fix_ffmpeg_3.4

6 years agohighgui: fix broken waitKey() condition in window_w32
berak [Tue, 6 Nov 2018 10:43:58 +0000 (11:43 +0100)]
highgui: fix broken waitKey() condition in window_w32

6 years agotypo in kmeans doc
LaurentBerger [Sun, 4 Nov 2018 20:30:31 +0000 (21:30 +0100)]
typo in kmeans doc

6 years agodocs: intro formatting update, minor cleanup
Alexander Alekhin [Sun, 4 Nov 2018 01:41:06 +0000 (01:41 +0000)]
docs: intro formatting update, minor cleanup

6 years agovideoio: fix build of standalone ffmpeg plugin
Alexander Alekhin [Sat, 3 Nov 2018 02:17:17 +0000 (02:17 +0000)]
videoio: fix build of standalone ffmpeg plugin

6 years agoAdd test for symmetric circles with clustering
fegorsch [Fri, 2 Nov 2018 14:13:46 +0000 (15:13 +0100)]
Add test for symmetric circles with clustering

6 years agoMerge pull request #13013 from berak:java_MatOfRotatedRect
Vadim Pisarevsky [Fri, 2 Nov 2018 12:36:06 +0000 (12:36 +0000)]
Merge pull request #13013 from berak:java_MatOfRotatedRect

6 years agoCircleGridClusterFinder: map circle pattern width and height correctly
fegorsch [Mon, 15 Oct 2018 16:13:03 +0000 (18:13 +0200)]
CircleGridClusterFinder: map circle pattern width and height correctly

During the cluster-based detection of circle grids, the detected circle
pattern has to be mapped to 3D-points. When doing this the width (i.e.
more circles) and height (i.e. less circles) of the pattern need to
be identified in image coordinates.

Until now this was done by assuming that the shorter side in image
coordinates (length in pixels) corresponds to the height in 3D.
This assumption does not hold if we look at the pattern from
a perspective where the projection of the width is shorter
than the projection of the height. This in turn lead to misdetections in
although the circle pattern was clearly visible.

Instead count how many circles have been detected along two edges of the
projected quadrangle and use the one with more circles as width and the
one with less as height.

6 years agoMerge pull request #10584 from eruffaldi:F10583_videoio_ffmpeg_lossless
Alexander Alekhin [Thu, 1 Nov 2018 16:57:11 +0000 (16:57 +0000)]
Merge pull request #10584 from eruffaldi:F10583_videoio_ffmpeg_lossless

6 years agoMerge pull request #13003 from native-api:cross_cutting_frameworks
Alexander Alekhin [Thu, 1 Nov 2018 16:46:11 +0000 (16:46 +0000)]
Merge pull request #13003 from native-api:cross_cutting_frameworks

6 years agoDetect cross-cutting frameworks before libraries so the latter can use them
Ivan Pozdeev [Wed, 31 Oct 2018 20:28:18 +0000 (23:28 +0300)]
Detect cross-cutting frameworks before libraries so the latter can use them

6 years agojava: add support for MatOfRotatedRect
berak [Thu, 1 Nov 2018 14:37:23 +0000 (15:37 +0100)]
java: add support for MatOfRotatedRect

6 years agoMerge pull request #13002 from dkurt:onnx_padding
Alexander Alekhin [Thu, 1 Nov 2018 11:40:22 +0000 (11:40 +0000)]
Merge pull request #13002 from dkurt:onnx_padding

6 years agoMerge pull request #12989 from venalil:fix_thresholded_tiff_read
Ilari Venäläinen [Thu, 1 Nov 2018 11:34:34 +0000 (13:34 +0200)]
Merge pull request #12989 from venalil:fix_thresholded_tiff_read

* Fix reading of black-and-white (thresholded) TIFF images

I recently updated my local OpenCV version to 3.4.3 and found out that
I could not read my TIFF images related to my project. After debugging I
found out that there has been some static analysis fixes made
that accidentally have broken reading those black-and-white TIFF images.

Commit hash in which reading of mentioned TIFF images has been broken:
cbb1e867e5141412c62ff534def7f117e28e04e8

Basically the fix is to revert back to the same functionality that has been there before,
when black-and-white images are read bpp (bitspersample) is 1.
Without the case 1: this TiffDecoder::readHeader() function always return false.

* Added type and default error message

* Added stdexcept include

* Use CV_Error instead of throw std::runtime_error

* imgcodecs(test): add TIFF B/W decoding tests

6 years agoffmpeg for lossy
Emanuele Ruffaldi [Fri, 12 Jan 2018 23:49:21 +0000 (00:49 +0100)]
ffmpeg for lossy

6 years agosamples(gpu): cleanup samples for legacy API
Alexander Alekhin [Wed, 31 Oct 2018 23:41:49 +0000 (23:41 +0000)]
samples(gpu): cleanup samples for legacy API

6 years agoMerge pull request #12991 from alalek:update_libpng_1.6.35
Alexander Alekhin [Wed, 31 Oct 2018 16:47:48 +0000 (16:47 +0000)]
Merge pull request #12991 from alalek:update_libpng_1.6.35

6 years agoAdd ONNX's padding import
Dmitry Kurtaev [Wed, 31 Oct 2018 15:24:05 +0000 (18:24 +0300)]
Add ONNX's padding import

6 years agoMerge pull request #12971 from sturkmen72:upd_imgproc_hpp
Suleyman TURKMEN [Wed, 31 Oct 2018 15:08:24 +0000 (18:08 +0300)]
Merge pull request #12971 from sturkmen72:upd_imgproc_hpp

* Update imgproc.hpp

* update color conversion codes

6 years agoMerge pull request #12997 from alalek:eliminate_gcc4_warnings
Alexander Alekhin [Wed, 31 Oct 2018 15:03:00 +0000 (15:03 +0000)]
Merge pull request #12997 from alalek:eliminate_gcc4_warnings

6 years agocmake: eliminate GCC4.x warnings
Alexander Alekhin [Wed, 31 Oct 2018 13:04:55 +0000 (16:04 +0300)]
cmake: eliminate GCC4.x warnings

6 years agoMerge pull request #12994 from vpisarev:fix_imshow_mac
Vadim Pisarevsky [Wed, 31 Oct 2018 11:13:28 +0000 (11:13 +0000)]
Merge pull request #12994 from vpisarev:fix_imshow_mac

6 years agofixed imshow on mac; before that just the window titlebar was shown, without the...
Vadim Pisarevsky [Wed, 31 Oct 2018 07:40:58 +0000 (10:40 +0300)]
fixed imshow on mac; before that just the window titlebar was shown, without the window content.

6 years agoMerge pull request #12982 from eldruin:python-gen-close-file
Alexander Alekhin [Tue, 30 Oct 2018 18:41:23 +0000 (18:41 +0000)]
Merge pull request #12982 from eldruin:python-gen-close-file

6 years ago3rdparty: update libpng 1.6.35
Alexander Alekhin [Tue, 30 Oct 2018 16:03:14 +0000 (19:03 +0300)]
3rdparty: update libpng 1.6.35

http://www.libpng.org/pub/png/libpng.html

6 years agoMerge pull request #12876 from savuor:color_rgb2rgb_wide
Rostislav Vasilikhin [Tue, 30 Oct 2018 15:36:23 +0000 (18:36 +0300)]
Merge pull request #12876 from savuor:color_rgb2rgb_wide

* RGB2RGB initially rewritten

* NEON impl removed

* templated version added for ushort, float

* data copying allowed for RGB2RGB

* inplace processing fixed

* fields to local vars

* no zeroupper until it's fixed

* vx_cleanup() added back

6 years agoMerge pull request #12948 from catree:add_drawFrameAxes
Alexander Alekhin [Tue, 30 Oct 2018 13:33:01 +0000 (13:33 +0000)]
Merge pull request #12948 from catree:add_drawFrameAxes

6 years agoMerge pull request #12938 from dkurt:java_ndim_mat
Alexander Alekhin [Mon, 29 Oct 2018 17:06:44 +0000 (17:06 +0000)]
Merge pull request #12938 from dkurt:java_ndim_mat

6 years agoFix closing input file
Diego Barrios Romero [Mon, 29 Oct 2018 09:54:50 +0000 (10:54 +0100)]
Fix closing input file

6 years agoMerge pull request #12964 from savuor:fix/zeroupper_all
Vadim Pisarevsky [Mon, 29 Oct 2018 11:35:57 +0000 (11:35 +0000)]
Merge pull request #12964 from savuor:fix/zeroupper_all

6 years agoMerge pull request #12966 from catree:fix_distortion_image
Vadim Pisarevsky [Mon, 29 Oct 2018 11:27:49 +0000 (11:27 +0000)]
Merge pull request #12966 from catree:fix_distortion_image

6 years agoMerge pull request #12975 from allnes:fix_russian_test
Vadim Pisarevsky [Mon, 29 Oct 2018 11:14:16 +0000 (11:14 +0000)]
Merge pull request #12975 from allnes:fix_russian_test

6 years agoFix dataset: russian.jpg
Alexander Nesterov [Sun, 28 Oct 2018 20:11:38 +0000 (19:11 -0100)]
Fix dataset: russian.jpg

6 years agoMerge pull request #12954 from seanm:MinorMac
Alexander Alekhin [Sun, 28 Oct 2018 14:52:31 +0000 (14:52 +0000)]
Merge pull request #12954 from seanm:MinorMac

6 years agoMerge pull request #12967 from catree:add_tutorial_video_java_python
Alexander Alekhin [Sat, 27 Oct 2018 17:04:49 +0000 (17:04 +0000)]
Merge pull request #12967 from catree:add_tutorial_video_java_python

6 years agoMerge pull request #12958 from kamino410:doc_dist_param
Alexander Alekhin [Sat, 27 Oct 2018 16:28:57 +0000 (16:28 +0000)]
Merge pull request #12958 from kamino410:doc_dist_param

6 years agoUpdate background subtraction tutorial with Java and Python codes.
catree [Fri, 26 Oct 2018 20:17:18 +0000 (22:17 +0200)]
Update background subtraction tutorial with Java and Python codes.

6 years agoFix distortion figure in calib3d. Positive radial distortion corresponds to pincushio...
catree [Fri, 26 Oct 2018 18:27:37 +0000 (20:27 +0200)]
Fix distortion figure in calib3d. Positive radial distortion corresponds to pincushion distortion and negative to barrel distortion. Add another figure that illustrates the influence of k1 in the distortion effect.

6 years agoMerge pull request #12946 from HenryDev:patch-1
Alexander Alekhin [Fri, 26 Oct 2018 18:26:06 +0000 (18:26 +0000)]
Merge pull request #12946 from HenryDev:patch-1

6 years ago_mm256_zeroupper replaced by zeroall
Rostislav Vasilikhin [Fri, 26 Oct 2018 15:12:07 +0000 (18:12 +0300)]
_mm256_zeroupper replaced by zeroall

6 years agoMerge pull request #12960 from alalek:workaround_ipp_sse42_meanstddev
Alexander Alekhin [Fri, 26 Oct 2018 14:50:49 +0000 (14:50 +0000)]
Merge pull request #12960 from alalek:workaround_ipp_sse42_meanstddev

6 years agocore(ipp): disable SSE4.2 meanStdDev() optimization for CV_32F
Alexander Alekhin [Fri, 26 Oct 2018 11:57:20 +0000 (14:57 +0300)]
core(ipp): disable SSE4.2 meanStdDev() optimization for CV_32F

6 years agofix document about camera distortion parameters
kamino410 [Fri, 26 Oct 2018 10:55:46 +0000 (19:55 +0900)]
fix document about camera distortion parameters

6 years agoFixed a few comments related to macOS support
Sean McBride [Thu, 25 Oct 2018 19:16:55 +0000 (15:16 -0400)]
Fixed a few comments related to macOS support

6 years agoAdd a function that draws frame axes. Useful for debugging purpose and to check the...
catree [Thu, 25 Oct 2018 15:57:18 +0000 (17:57 +0200)]
Add a function that draws frame axes. Useful for debugging purpose and to check the correctness of the output of a pose estimation method.

6 years agoMerge pull request #12905 from tomoaki0705:fixQrcodePeakyFailure
Alexander Alekhin [Thu, 25 Oct 2018 16:24:56 +0000 (16:24 +0000)]
Merge pull request #12905 from tomoaki0705:fixQrcodePeakyFailure

6 years agoUpdate intro.markdown
Henry [Thu, 25 Oct 2018 15:54:07 +0000 (10:54 -0500)]
Update intro.markdown

"as opposed to" is a phrase of opposed meaning distinguished from or in contrast with. e.g., "an approach that is theoretical as opposed to practical"
synonyms: in contrast with, as against, as contrasted with, rather than, instead of, as an alternative to
example: "we use only steam, as opposed to chemical products, to clean our house"

6 years agoMerge pull request #12935 from alalek:python_so_warning
Alexander Alekhin [Thu, 25 Oct 2018 15:11:44 +0000 (15:11 +0000)]
Merge pull request #12935 from alalek:python_so_warning

6 years agoMerge pull request #12804 from alalek:editorconfig
Alexander Alekhin [Thu, 25 Oct 2018 14:17:42 +0000 (14:17 +0000)]
Merge pull request #12804 from alalek:editorconfig

6 years agoMerge pull request #12854 from allnes:detect_qr_code
Alexander Alekhin [Thu, 25 Oct 2018 14:16:55 +0000 (14:16 +0000)]
Merge pull request #12854 from allnes:detect_qr_code

6 years agoMerge pull request #12930 from aliyasineser:3.4
Alexander Alekhin [Thu, 25 Oct 2018 14:12:16 +0000 (17:12 +0300)]
Merge pull request #12930 from aliyasineser:3.4

Update depth map for python-opencv

6 years agoMerge pull request #12925 from alalek:fix_cmake_conditions
Alexander Alekhin [Thu, 25 Oct 2018 11:52:39 +0000 (11:52 +0000)]
Merge pull request #12925 from alalek:fix_cmake_conditions

6 years agoMerge pull request #12934 from alalek:issue_12932
Alexander Alekhin [Thu, 25 Oct 2018 11:28:12 +0000 (11:28 +0000)]
Merge pull request #12934 from alalek:issue_12932

6 years agoMerge pull request #12928 from alalek:fix_typo_3.4
Alexander Alekhin [Thu, 25 Oct 2018 11:04:59 +0000 (11:04 +0000)]
Merge pull request #12928 from alalek:fix_typo_3.4

6 years agoAdd methods to reshape Mat in Java by array of shapes and retreive sizes of each...
Dmitry Kurtaev [Thu, 25 Oct 2018 07:48:23 +0000 (10:48 +0300)]
Add methods to reshape Mat in Java by array of shapes and retreive sizes of each dimension.

6 years agopython: eliminate DeprecationWarning: SO -> EXT_SUFFIX
Alexander Alekhin [Thu, 25 Oct 2018 03:47:59 +0000 (03:47 +0000)]
python: eliminate DeprecationWarning: SO -> EXT_SUFFIX

- https://python.readthedocs.io/en/stable/whatsnew/3.4.html
- The `sysconfig` key `SO` is deprecated, it has been replaced by `EXT_SUFFIX`

6 years agocore: move compiler defines from base.hpp into cvdef.h
Alexander Alekhin [Thu, 25 Oct 2018 03:02:01 +0000 (03:02 +0000)]
core: move compiler defines from base.hpp into cvdef.h

6 years agoMerge pull request #12868 from VladKarpushin:tutorial-using-periodic-noise-removing...
Alexander Alekhin [Wed, 24 Oct 2018 20:24:50 +0000 (20:24 +0000)]
Merge pull request #12868 from VladKarpushin:tutorial-using-periodic-noise-removing-filter

6 years agoUpdate depth map for pytho-opencv
Ali Yasin Eser [Wed, 24 Oct 2018 17:29:27 +0000 (19:29 +0200)]
Update depth map for pytho-opencv

6 years agoAdded perf tests with sanity check
Alexander Nesterov [Tue, 16 Oct 2018 12:27:37 +0000 (12:27 +0000)]
Added perf tests with sanity check

6 years agoMerge pull request #12888 from alalek:cmake_fix_objdetect
Alexander Alekhin [Wed, 24 Oct 2018 16:22:26 +0000 (16:22 +0000)]
Merge pull request #12888 from alalek:cmake_fix_objdetect

6 years agovideoio: fix typo
Alexander Alekhin [Wed, 24 Oct 2018 16:12:35 +0000 (19:12 +0300)]
videoio: fix typo

6 years agoMerge pull request #12881 from huangqinjin:orb
Alexander Alekhin [Wed, 24 Oct 2018 13:28:57 +0000 (13:28 +0000)]
Merge pull request #12881 from huangqinjin:orb

6 years agoMerge pull request #12914 from seiko2plus:issue12830
Alexander Alekhin [Wed, 24 Oct 2018 13:15:23 +0000 (13:15 +0000)]
Merge pull request #12914 from seiko2plus:issue12830

6 years agoMerge pull request #12921 from alalek:ios_xcode10
Alexander Alekhin [Wed, 24 Oct 2018 13:06:27 +0000 (13:06 +0000)]
Merge pull request #12921 from alalek:ios_xcode10

6 years agoMerge pull request #12909 from alalek:cmake_fix_baseline_detect_flags
Alexander Alekhin [Wed, 24 Oct 2018 13:05:14 +0000 (13:05 +0000)]
Merge pull request #12909 from alalek:cmake_fix_baseline_detect_flags

6 years agoMerge pull request #12919 from berak:fix_dnn_sample_common
Alexander Alekhin [Wed, 24 Oct 2018 13:03:37 +0000 (13:03 +0000)]
Merge pull request #12919 from berak:fix_dnn_sample_common

6 years agoMerge pull request #12877 from maver1:3.4
maver1 [Wed, 24 Oct 2018 12:02:53 +0000 (15:02 +0300)]
Merge pull request #12877 from maver1:3.4

* Updated ICV packages and IPP integration

* core(test): minMaxIdx IPP regression test

* core(ipp): workaround minMaxIdx problem

* core(ipp): workaround meanStdDev() CV_32FC3 buffer overrun

* Returned semicolon after CV_INSTRUMENT_REGION_IPP()

6 years agodnn/samples: handle not set env vars gracefully
berak [Wed, 24 Oct 2018 10:37:01 +0000 (12:37 +0200)]
dnn/samples: handle not set env vars gracefully

6 years agoMerge pull request #12713 from antonioborondo:depthwise_convolution
Alexander Alekhin [Wed, 24 Oct 2018 09:17:56 +0000 (09:17 +0000)]
Merge pull request #12713 from antonioborondo:depthwise_convolution

6 years agoRecognize ConvolutionDepthwise as Convolution
Antonio Borondo [Tue, 23 Oct 2018 19:17:22 +0000 (20:17 +0100)]
Recognize ConvolutionDepthwise as Convolution

6 years agocore:vsx change behavior of v_round to rounding to nearest even
Sayed Adel [Wed, 24 Oct 2018 04:33:08 +0000 (04:33 +0000)]
core:vsx change behavior of v_round to rounding to nearest even

6 years agoios: update build script
Alexander Alekhin [Wed, 24 Oct 2018 04:37:31 +0000 (04:37 +0000)]
ios: update build script

- IPHONEOS_DEPLOYMENT_TARGET=8.0 by default (minimal for XCode 10)

6 years agocmake: don't change baseline compiler flags in 'detection' mode
Alexander Alekhin [Wed, 24 Oct 2018 03:54:31 +0000 (03:54 +0000)]
cmake: don't change baseline compiler flags in 'detection' mode

6 years agoobjdetect: fix test failure of QR code on Aarch64
Tomoaki Teshima [Wed, 24 Oct 2018 00:35:02 +0000 (09:35 +0900)]
objdetect: fix test failure of QR code on Aarch64
  * use boundingRect instead of manual loop

6 years agoORB: compute default norm by wta_k
huangqinjin [Sat, 20 Oct 2018 13:43:39 +0000 (21:43 +0800)]
ORB: compute default norm by wta_k

6 years agocmake: fix objdetect QR decoder link_libraries
Mansoo Kim [Sun, 21 Oct 2018 15:13:43 +0000 (15:13 +0000)]
cmake: fix objdetect QR decoder link_libraries

6 years agocmake: fix variable expand in CMake conditions
Alexander Alekhin [Sun, 21 Oct 2018 15:02:40 +0000 (15:02 +0000)]
cmake: fix variable expand in CMake conditions

6 years agoMerge pull request #12871 from UnderscoreAsterisk:document-Distance
Apoorv Goel [Sat, 20 Oct 2018 08:15:13 +0000 (13:45 +0530)]
Merge pull request #12871 from UnderscoreAsterisk:document-Distance

* Document distance functors in dist.h

* Add spec for Distance

* Generate appropriate links for symbols

6 years agoMerge pull request #12875 from dkurt:dnn_enet_accuracy
Alexander Alekhin [Fri, 19 Oct 2018 15:33:48 +0000 (15:33 +0000)]
Merge pull request #12875 from dkurt:dnn_enet_accuracy

6 years agoFix ENet test
Dmitry Kurtaev [Fri, 19 Oct 2018 14:43:26 +0000 (17:43 +0300)]
Fix ENet test

6 years agoMerge pull request #12867 from UnderscoreAsterisk:document-radiusSearch
Alexander Alekhin [Thu, 18 Oct 2018 07:52:49 +0000 (07:52 +0000)]
Merge pull request #12867 from UnderscoreAsterisk:document-radiusSearch

6 years agoMerge pull request #12832 from kmansoo:fix-compile-errors-on-nvcc10
Alexander Alekhin [Thu, 18 Oct 2018 07:51:47 +0000 (07:51 +0000)]
Merge pull request #12832 from kmansoo:fix-compile-errors-on-nvcc10

6 years agodoc: add new tutorial periodic noise removing filter
Karpushin Vladislav [Thu, 18 Oct 2018 04:41:59 +0000 (11:41 +0700)]
doc: add new tutorial periodic noise removing filter

6 years agoAdd documentation for radiusSearch
Apoorv [Wed, 17 Oct 2018 22:39:16 +0000 (04:09 +0530)]
Add documentation for radiusSearch

6 years agocuda: fix build with CUDA 10.x
Mansoo Kim [Wed, 17 Oct 2018 17:35:40 +0000 (17:35 +0000)]
cuda: fix build with CUDA 10.x

6 years agoMerge pull request #12852 from nangchoo:bugfix/increase_magic_threshold_for_perf_test
Alexander Alekhin [Wed, 17 Oct 2018 17:31:19 +0000 (17:31 +0000)]
Merge pull request #12852 from nangchoo:bugfix/increase_magic_threshold_for_perf_test

6 years agoMerge pull request #12844 from jasjuang:3.4
Alexander Alekhin [Wed, 17 Oct 2018 17:31:00 +0000 (17:31 +0000)]
Merge pull request #12844 from jasjuang:3.4

6 years agoMerge pull request #12864 from dkurt:dnn_ie_get_batch_size
Alexander Alekhin [Wed, 17 Oct 2018 14:02:25 +0000 (14:02 +0000)]
Merge pull request #12864 from dkurt:dnn_ie_get_batch_size

6 years agoImplement getBatchSize for Intel's Inference Engine networks
Dmitry Kurtaev [Wed, 17 Oct 2018 11:02:37 +0000 (14:02 +0300)]
Implement getBatchSize for Intel's Inference Engine networks

6 years agoMerge pull request #12860 from janisozaur:include-guards
Alexander Alekhin [Wed, 17 Oct 2018 08:20:31 +0000 (08:20 +0000)]
Merge pull request #12860 from janisozaur:include-guards

6 years agoMerge pull request #12859 from janisozaur:empty-block
Alexander Alekhin [Wed, 17 Oct 2018 08:20:08 +0000 (08:20 +0000)]
Merge pull request #12859 from janisozaur:empty-block

6 years agoMerge pull request #12858 from janisozaur:catch-by-ref
Alexander Alekhin [Wed, 17 Oct 2018 08:19:11 +0000 (08:19 +0000)]
Merge pull request #12858 from janisozaur:catch-by-ref

6 years agoFix clashing include guards
Michał Janiszewski [Tue, 16 Oct 2018 19:15:54 +0000 (21:15 +0200)]
Fix clashing include guards

Relevant guards can be found in
https://github.com/opencv/opencv/blob/ef5579dc8667e5eb5e149acc4af898421eed99da/modules/features2d/src/kaze/AKAZEConfig.h#L8
and
https://github.com/opencv/opencv/blob/ef5579dc8667e5eb5e149acc4af898421eed99da/modules/ml/include/opencv2/ml.hpp#L44