platform/upstream/opencv.git
6 years agoMerge pull request #10876 from alalek:android_static_libs
Vadim Pisarevsky [Mon, 19 Feb 2018 14:16:06 +0000 (14:16 +0000)]
Merge pull request #10876 from alalek:android_static_libs

6 years agoMerge pull request #10880 from StevenPuttemans:fix_10594
Vadim Pisarevsky [Mon, 19 Feb 2018 14:13:43 +0000 (14:13 +0000)]
Merge pull request #10880 from StevenPuttemans:fix_10594

6 years agoMerge pull request #10893 from alalek:fix_cpu_disable_flags
Vadim Pisarevsky [Mon, 19 Feb 2018 14:11:11 +0000 (14:11 +0000)]
Merge pull request #10893 from alalek:fix_cpu_disable_flags

6 years agoMerge pull request #10896 from dkurt:tensorflow_tests_generator
Vadim Pisarevsky [Mon, 19 Feb 2018 14:08:58 +0000 (14:08 +0000)]
Merge pull request #10896 from dkurt:tensorflow_tests_generator

6 years agoMerge pull request #10900 from tomoaki0705:fixPerfVideoioGstreamer
Alexander Alekhin [Mon, 19 Feb 2018 13:59:20 +0000 (13:59 +0000)]
Merge pull request #10900 from tomoaki0705:fixPerfVideoioGstreamer

6 years agoread in gray scale mode when writing a gray scale video
Tomoaki Teshima [Mon, 19 Feb 2018 09:33:05 +0000 (18:33 +0900)]
read in gray scale mode when writing a gray scale video

6 years agoFix DNN flatten test
Dmitry Kurtaev [Sun, 18 Feb 2018 09:45:43 +0000 (12:45 +0300)]
Fix DNN flatten test

6 years agoMerge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf
Alexander Alekhin [Sun, 18 Feb 2018 07:45:01 +0000 (07:45 +0000)]
Merge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf

6 years agofix test error on VS2013
Tomoaki Teshima [Sun, 18 Feb 2018 00:29:38 +0000 (09:29 +0900)]
fix test error on VS2013

6 years agocore: remove '-' from separators list of disabled CPU flags
Alexander Alekhin [Sun, 18 Feb 2018 00:03:04 +0000 (00:03 +0000)]
core: remove '-' from separators list of disabled CPU flags

To allow runtime disabling of AVX512-SKX via 'OPENCV_CPU_DISABLE' parameter

6 years agoMerge pull request #10868 from mshabunin:sample-bgsegm
Maksim Shabunin [Sat, 17 Feb 2018 12:04:14 +0000 (15:04 +0300)]
Merge pull request #10868 from mshabunin:sample-bgsegm

* Samples: reworked bgfg_bgsegm

* fixup! Samples: reworked bgfg_bgsegm

6 years agoMerge pull request #10890 from Reputeless:patch-1
Alexander Alekhin [Sat, 17 Feb 2018 12:02:48 +0000 (12:02 +0000)]
Merge pull request #10890 from Reputeless:patch-1

6 years agoMerge pull request #10081 from floe:java-camera2-view
Florian Echtler [Sat, 17 Feb 2018 12:01:24 +0000 (13:01 +0100)]
Merge pull request #10081 from floe:java-camera2-view

* add (untested) JavaCamera2View class

* initial fixes

* minor cleanup

* exclude JavaCamera2View from build for older SDK version

* fix method name typo

* add asserts + sanity checks

* fix preview format checks

* fix the memory leak

* export cvtTwoPlaneYUVtoBGR for Java usage

* add handling for two-plane YUV frames (C wrapper still missing)

* add two-plane cvtColor helper function

* fix warnings

* actually use the new cvtColorTwoPlane helper func

* fix wrong output matrix size

* fix wrong conversion type

* simplify method signature, add error condition

* minor fixes to Mat types

* remove leftover semaphore from camera api 1

* android: JavaCamera2View minor refactoring

- re-apply Java code style
- imports cleanup
- dump exceptions information

* android: JavaCamera2View: pause/resume fixes

* android: JavaCamera2View: fix mScale

6 years agoMerge pull request #10885 from alalek:issue_10881
Alexander Alekhin [Sat, 17 Feb 2018 11:58:51 +0000 (11:58 +0000)]
Merge pull request #10885 from alalek:issue_10881

6 years agoMerge pull request #10589 from patrikhuber:patch-1
Patrik Huber [Sat, 17 Feb 2018 11:53:30 +0000 (11:53 +0000)]
Merge pull request #10589 from patrikhuber:patch-1

* Make <array> #ifdef true for MSVC

I think MSVC had `std::array` for quite a while (possibly going back as far as VS 2012, but it's definitely there in 2015 and 2017. So I think `_MSC_VER` `1900` is a safe bet. Probably `1800` and maybe even `1700` could work as well but I can't test that locally.

* fix test

6 years agoFix typo in core/base.hpp
Ryo Suzuki [Sat, 17 Feb 2018 10:35:25 +0000 (19:35 +0900)]
Fix typo in core/base.hpp

6 years agocore: fix parallel_for data race
Alexander Alekhin [Fri, 16 Feb 2018 11:08:51 +0000 (14:08 +0300)]
core: fix parallel_for data race

6 years agoMerge pull request #10867 from dkurt:dnn_fix_ave_pooling_area
Alexander Alekhin [Fri, 16 Feb 2018 11:17:32 +0000 (11:17 +0000)]
Merge pull request #10867 from dkurt:dnn_fix_ave_pooling_area

6 years agoMerge pull request #10883 from alalek:portable_stdint
Alexander Alekhin [Fri, 16 Feb 2018 10:29:39 +0000 (10:29 +0000)]
Merge pull request #10883 from alalek:portable_stdint

6 years agobuild: portable integer types
Alexander Alekhin [Thu, 15 Feb 2018 20:19:02 +0000 (23:19 +0300)]
build: portable integer types

6 years agoMerge pull request #10793 from denmatfoton:master
Alexander Alekhin [Thu, 15 Feb 2018 15:52:52 +0000 (15:52 +0000)]
Merge pull request #10793 from denmatfoton:master

6 years agoMerge pull request #10879 from StevenPuttemans:fix_10650
Alexander Alekhin [Thu, 15 Feb 2018 15:48:12 +0000 (15:48 +0000)]
Merge pull request #10879 from StevenPuttemans:fix_10650

6 years agoMerge pull request #10727 from alalek:cmake_hook_system
Alexander Alekhin [Thu, 15 Feb 2018 15:46:12 +0000 (15:46 +0000)]
Merge pull request #10727 from alalek:cmake_hook_system

6 years agoMerge pull request #10145 from allnes:vedeoio_avi_container
Alexander Alekhin [Thu, 15 Feb 2018 15:14:03 +0000 (15:14 +0000)]
Merge pull request #10145 from allnes:vedeoio_avi_container

6 years agoadd missing DNN header to opencv2/opencv.hpp
Steven [Thu, 15 Feb 2018 14:59:14 +0000 (15:59 +0100)]
add missing DNN header to opencv2/opencv.hpp

6 years agofix tutorial on real time pose estimation
Steven [Thu, 15 Feb 2018 14:44:51 +0000 (15:44 +0100)]
fix tutorial on real time pose estimation

6 years agoAdded avi-container with tests
Alexander Nesterov [Wed, 14 Feb 2018 15:04:54 +0000 (18:04 +0300)]
Added avi-container with tests

6 years agoandroid: move .a files into 'staticlibs' directory
Alexander Alekhin [Thu, 15 Feb 2018 12:49:31 +0000 (15:49 +0300)]
android: move .a files into 'staticlibs' directory

to reduce overhead of gradle builds

6 years agocalib3d: add regression test for stereoCalibrate
Alexander Alekhin [Thu, 15 Feb 2018 12:17:42 +0000 (15:17 +0300)]
calib3d: add regression test for stereoCalibrate

6 years agocmake: customize OpenCV build via CMake script hooks
Alexander Alekhin [Mon, 29 Jan 2018 15:02:00 +0000 (18:02 +0300)]
cmake: customize OpenCV build via CMake script hooks

6 years agoAdd a flag to manage average pooling with padding
Dmitry Kurtaev [Wed, 14 Feb 2018 13:56:31 +0000 (16:56 +0300)]
Add a flag to manage average pooling with padding

6 years agoMerge pull request #10854 from pengli:dnn
Alexander Alekhin [Wed, 14 Feb 2018 12:49:53 +0000 (12:49 +0000)]
Merge pull request #10854 from pengli:dnn

6 years agoMerge pull request #10864 from alalek:cmake_update_debug_info
Alexander Alekhin [Wed, 14 Feb 2018 12:47:43 +0000 (12:47 +0000)]
Merge pull request #10864 from alalek:cmake_update_debug_info

6 years agoMerge pull request #10865 from dkurt:dnn_inf_engine_getInputsInfo
Vadim Pisarevsky [Wed, 14 Feb 2018 12:25:18 +0000 (12:25 +0000)]
Merge pull request #10865 from dkurt:dnn_inf_engine_getInputsInfo

6 years agoMerge pull request #10678 from terfendail:OutputArray_recreate
Vadim Pisarevsky [Wed, 14 Feb 2018 11:36:50 +0000 (11:36 +0000)]
Merge pull request #10678 from terfendail:OutputArray_recreate

6 years agoMerge pull request #10856 from tomoaki0705:fixVisualStudioFixedWidthInt
Vadim Pisarevsky [Wed, 14 Feb 2018 11:33:15 +0000 (11:33 +0000)]
Merge pull request #10856 from tomoaki0705:fixVisualStudioFixedWidthInt

6 years agoAdd const getInputsInfo
Dmitry Kurtaev [Wed, 14 Feb 2018 11:17:44 +0000 (14:17 +0300)]
Add const getInputsInfo

6 years agoMerge pull request #10861 from nglee:dev_cudaDftAlgorithmTest
Vadim Pisarevsky [Wed, 14 Feb 2018 10:50:05 +0000 (10:50 +0000)]
Merge pull request #10861 from nglee:dev_cudaDftAlgorithmTest

6 years agoMerge pull request #10863 from mshabunin:fix-viz-samples-build
Vadim Pisarevsky [Wed, 14 Feb 2018 10:49:05 +0000 (10:49 +0000)]
Merge pull request #10863 from mshabunin:fix-viz-samples-build

6 years agocmake: debug info
Alexander Alekhin [Tue, 13 Feb 2018 14:34:40 +0000 (17:34 +0300)]
cmake: debug info

6 years agoMerge pull request #10850 from dkurt:dnn_tf_deconv_tests
Vadim Pisarevsky [Wed, 14 Feb 2018 10:35:14 +0000 (10:35 +0000)]
Merge pull request #10850 from dkurt:dnn_tf_deconv_tests

6 years agoMerge pull request #10859 from luzpaz:misc-modules-typos-cont-2
Alexander Alekhin [Wed, 14 Feb 2018 09:56:11 +0000 (09:56 +0000)]
Merge pull request #10859 from luzpaz:misc-modules-typos-cont-2

6 years agoSamples: fixed samples build in case the viz module is disabled
Maksim Shabunin [Wed, 14 Feb 2018 09:45:10 +0000 (12:45 +0300)]
Samples: fixed samples build in case the viz module is disabled

6 years agoFix for CUDA_Arithm/Dft.Algorithm/0 test
Namgoo Lee [Wed, 14 Feb 2018 00:54:13 +0000 (09:54 +0900)]
Fix for CUDA_Arithm/Dft.Algorithm/0 test

6 years agore-enable tensor flow mobilenet ssd ocl test
Li Peng [Mon, 12 Feb 2018 11:14:41 +0000 (19:14 +0800)]
re-enable tensor flow mobilenet ssd ocl test

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoMisc. modules/ cont. pt2
luz.paz [Tue, 13 Feb 2018 16:28:11 +0000 (11:28 -0500)]
Misc. modules/ cont. pt2

Found via `codespell`

6 years agoMerge pull request #10846 from luzpaz:misc-modules-typos-cont
Alexander Alekhin [Tue, 13 Feb 2018 16:12:28 +0000 (16:12 +0000)]
Merge pull request #10846 from luzpaz:misc-modules-typos-cont

6 years agoMerge pull request #10821 from dkurt:dnn_layers_fusion
Alexander Alekhin [Tue, 13 Feb 2018 16:08:48 +0000 (16:08 +0000)]
Merge pull request #10821 from dkurt:dnn_layers_fusion

6 years agoadd fallback case for ocl convolution
Li Peng [Mon, 12 Feb 2018 14:52:37 +0000 (22:52 +0800)]
add fallback case for ocl convolution

The ocl convolution doesn't support tensorflow padMode well.
Add fallback check if we meet this situation, it could fix the
tensorflow MobileNet SSD failure.

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoocl fix for detection_output and prior_box layer
Li Peng [Sun, 11 Feb 2018 10:12:25 +0000 (18:12 +0800)]
ocl fix for detection_output and prior_box layer

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agoMerge pull request #10818 from mshabunin:install-samples-src
Alexander Alekhin [Tue, 13 Feb 2018 14:37:38 +0000 (14:37 +0000)]
Merge pull request #10818 from mshabunin:install-samples-src

6 years agoMerge pull request #10852 from alalek:fix_cpuid
Alexander Alekhin [Tue, 13 Feb 2018 13:56:22 +0000 (13:56 +0000)]
Merge pull request #10852 from alalek:fix_cpuid

6 years agocore: generalize and fix x86 'cpuid' calls
Alexander Alekhin [Mon, 12 Feb 2018 19:34:18 +0000 (19:34 +0000)]
core: generalize and fix x86 'cpuid' calls

6 years agoRefactored deep learning layers fusion
Dmitry Kurtaev [Tue, 13 Feb 2018 09:07:56 +0000 (12:07 +0300)]
Refactored deep learning layers fusion

6 years agofix build error on Visual Studio 2013 and earlier
Tomoaki Teshima [Tue, 13 Feb 2018 09:30:02 +0000 (18:30 +0900)]
fix build error on Visual Studio 2013 and earlier

6 years agoFix deconvolution layer. Add batch norm layer with mean-variance normalization from...
Dmitry Kurtaev [Mon, 12 Feb 2018 15:55:27 +0000 (18:55 +0300)]
Fix deconvolution layer. Add batch norm layer with mean-variance normalization from TensorFlow.

6 years agoSamples: fixed viz tutorials building with enabled opencv_world
Maksim Shabunin [Mon, 12 Feb 2018 15:39:32 +0000 (18:39 +0300)]
Samples: fixed viz tutorials building with enabled opencv_world

6 years agoAdded group targets for samples (opencv_samples, opencv_samples_<group>), install...
Maksim Shabunin [Fri, 9 Feb 2018 13:17:01 +0000 (16:17 +0300)]
Added group targets for samples (opencv_samples, opencv_samples_<group>), install samples/data inseparate component 'samples_data'

6 years agocmake: refactored scripts with samples building:
Maksim Shabunin [Fri, 9 Feb 2018 10:30:04 +0000 (13:30 +0300)]
cmake: refactored scripts with samples building:

- allow installing samples sources on all platforms
  even if BUILD_EXAMPLES is disabled,  fixed minor
  issues in sources installation process
- use 'example_<group>_<name>' scheme for target and binary file naming
- use single function for sample executable creation

6 years agoFixed compilation warnings in samples:
Maksim Shabunin [Fri, 9 Feb 2018 10:24:18 +0000 (13:24 +0300)]
Fixed compilation warnings in samples:

- use per-module includes instead of "opencv.hpp"
- unused function warnings
- undefined macro warning

6 years agoFixed OpenGL-specific compilation warning (unused function)
Maksim Shabunin [Fri, 9 Feb 2018 10:21:17 +0000 (13:21 +0300)]
Fixed OpenGL-specific compilation warning (unused function)

6 years agoMerge pull request #10845 from alalek:cpu_dispatch_fix_file_generation
Alexander Alekhin [Mon, 12 Feb 2018 15:39:24 +0000 (15:39 +0000)]
Merge pull request #10845 from alalek:cpu_dispatch_fix_file_generation

6 years agoMisc. modules/ typos (cont.)
luz.paz [Mon, 12 Feb 2018 15:15:36 +0000 (10:15 -0500)]
Misc. modules/ typos (cont.)

Found via `codespell`

6 years agocmake: reset __content variable if file doesn't exist
Alexander Alekhin [Mon, 12 Feb 2018 14:30:53 +0000 (17:30 +0300)]
cmake: reset __content variable if file doesn't exist

Resolves CMake error after relaunch with updated source code:
Cannot find source file:
    modules/dnn/layers/layers_common.avx512_skx.cpp

6 years agoMerge pull request #10797 from mshabunin:split-convert
Alexander Alekhin [Mon, 12 Feb 2018 13:49:53 +0000 (13:49 +0000)]
Merge pull request #10797 from mshabunin:split-convert

6 years agoMerge pull request #10798 from mshabunin:split-stat
Alexander Alekhin [Mon, 12 Feb 2018 13:49:41 +0000 (13:49 +0000)]
Merge pull request #10798 from mshabunin:split-stat

6 years agoMerge pull request #10822 from alalek:ocl_fix_imgproc_amd
Alexander Alekhin [Mon, 12 Feb 2018 13:48:06 +0000 (13:48 +0000)]
Merge pull request #10822 from alalek:ocl_fix_imgproc_amd

6 years agoMerge pull request #10843 from luzpaz:misc-modules-typos
Alexander Alekhin [Mon, 12 Feb 2018 13:47:12 +0000 (13:47 +0000)]
Merge pull request #10843 from luzpaz:misc-modules-typos

6 years agofix faster_rcnn sample crashed at PoolingInvoker on Windows7(x64). (#10724)
Sui Libin [Mon, 12 Feb 2018 13:07:56 +0000 (21:07 +0800)]
fix faster_rcnn sample crashed at PoolingInvoker on Windows7(x64). (#10724)

* fix faster_rcnn sample crashed at PoolingInvoker operator() of pooling_layer.

* find_odj onmouse bug about find matched point status.

* reverted AutoBuffer back to std::vector

6 years agoSplit convert.cpp into smaller pieces
Maksim Shabunin [Tue, 6 Feb 2018 12:02:51 +0000 (15:02 +0300)]
Split convert.cpp into smaller pieces

6 years agoMisc. modules/ typos
luz.paz [Mon, 12 Feb 2018 12:07:39 +0000 (07:07 -0500)]
Misc. modules/ typos

Found via `codespell`

6 years agodnn : Added an imagesFromBlob method to the dnn module (#10607)
Rémi Ratajczak [Mon, 12 Feb 2018 11:51:07 +0000 (12:51 +0100)]
dnn : Added an imagesFromBlob method to the dnn module (#10607)

* Added the imagesFromBlob method to the dnn module.

* Rewritten imagesFromBlob based on first dkurt comments

* Updated code with getPlane()

* Modify comment of imagesFromBlob() in dnn module

* modified comments, removed useless assertions & added OutputArrayOfArray

* replaced tabs with whitespaces & put vectorOfChannels instantiation outside the loop

* Changed pre-commit.sample to pre-commit in .git/hooks/

* Added a test for imagesFromBlob in test_misc.cpp (dnn)

* Changed nbOfImages, robustified test with cv::randu, modified assertion

6 years agocmake: update reporting of excluded dispatching files (#10711)
Alexander Alekhin [Mon, 12 Feb 2018 11:48:20 +0000 (14:48 +0300)]
cmake: update reporting of excluded dispatching files (#10711)

* cmake: add ocv_get_smart_file_name() macro

* cmake: avoid adding files for unavailable dispatch modes

6 years agoUpdate BufferReader documentation with some example code (#10803)
Namgoo Lee [Mon, 12 Feb 2018 11:41:23 +0000 (20:41 +0900)]
Update BufferReader documentation with some example code (#10803)

* Update BufferReader documentation with some example code

* Add warning to BufferPool doc regarding deallocation of StackAllocator

* Added a sample code that satisfies LIFO rule for StackAllocator

6 years agoMerge pull request #10805 from dkurt:dnn_inf_engine_tf_ssd
Vadim Pisarevsky [Mon, 12 Feb 2018 11:39:59 +0000 (11:39 +0000)]
Merge pull request #10805 from dkurt:dnn_inf_engine_tf_ssd

6 years agoAdd new Mat constructor (#10808)
yuki takehara [Mon, 12 Feb 2018 11:36:54 +0000 (20:36 +0900)]
Add new Mat constructor (#10808)

* Add new Mat constructor

* Fix build error

* Fix build error

* Fixed the code about 4 comments

* Fixed three comments

* delete previous local declaration

* fix build error

6 years agoSplit stat.cpp into smaller pieces
Maksim Shabunin [Tue, 6 Feb 2018 12:54:14 +0000 (15:54 +0300)]
Split stat.cpp into smaller pieces

6 years agoocl: disable Laplacian5 and sepFilter2D_SinglePass kernels for AMD OpenCL
Alexander Alekhin [Fri, 9 Feb 2018 15:22:08 +0000 (18:22 +0300)]
ocl: disable Laplacian5 and sepFilter2D_SinglePass kernels for AMD OpenCL

6 years agoMerge pull request #10839 from csukuangfj:fix-9486
Alexander Alekhin [Mon, 12 Feb 2018 09:24:28 +0000 (09:24 +0000)]
Merge pull request #10839 from csukuangfj:fix-9486

6 years agoMerge pull request #10836 from csukuangfj:fix-10826
Alexander Alekhin [Mon, 12 Feb 2018 09:23:55 +0000 (09:23 +0000)]
Merge pull request #10836 from csukuangfj:fix-10826

6 years agoMerge pull request #10835 from csukuangfj:fix-10827
Alexander Alekhin [Mon, 12 Feb 2018 09:19:51 +0000 (09:19 +0000)]
Merge pull request #10835 from csukuangfj:fix-10827

6 years agoMerge pull request #10834 from csukuangfj:fix-issue-9387
Alexander Alekhin [Mon, 12 Feb 2018 09:19:25 +0000 (09:19 +0000)]
Merge pull request #10834 from csukuangfj:fix-issue-9387

6 years agoMerge pull request #10833 from csukuangfj:improve-viz3d
Alexander Alekhin [Mon, 12 Feb 2018 09:12:39 +0000 (09:12 +0000)]
Merge pull request #10833 from csukuangfj:improve-viz3d

6 years agofix issue #9387 and #9575.
Fangjun Kuang [Sun, 11 Feb 2018 07:49:33 +0000 (15:49 +0800)]
fix issue #9387 and #9575.

6 years agofix issue #9486.
Fangjun Kuang [Sun, 11 Feb 2018 12:08:53 +0000 (20:08 +0800)]
fix issue #9486.

6 years agoimprove the doc for the viz module.
Fangjun Kuang [Sun, 11 Feb 2018 06:15:50 +0000 (14:15 +0800)]
improve the doc for the viz module.

6 years agoFix issue 10826.
Fangjun Kuang [Sun, 11 Feb 2018 08:01:21 +0000 (16:01 +0800)]
Fix issue 10826.

6 years agoFix issue 10827.
Fangjun Kuang [Sun, 11 Feb 2018 07:54:36 +0000 (15:54 +0800)]
Fix issue 10827.

6 years agoMerge pull request #10813 from alalek:cmake_cxx_flags
Alexander Alekhin [Sat, 10 Feb 2018 12:26:59 +0000 (12:26 +0000)]
Merge pull request #10813 from alalek:cmake_cxx_flags

6 years agoMerge pull request #10820 from alalek:python_isystem
Alexander Alekhin [Fri, 9 Feb 2018 15:32:50 +0000 (15:32 +0000)]
Merge pull request #10820 from alalek:python_isystem

6 years agoMerge pull request #10819 from alalek:ocl_fix_dgpu_locks
Alexander Alekhin [Fri, 9 Feb 2018 15:24:33 +0000 (15:24 +0000)]
Merge pull request #10819 from alalek:ocl_fix_dgpu_locks

6 years agocmake: use -isystem for Python/numpy include directories
Alexander Alekhin [Fri, 9 Feb 2018 14:10:02 +0000 (17:10 +0300)]
cmake: use -isystem for Python/numpy include directories

6 years agobuild: eliminate c++17 Python build warning
Alexander Alekhin [Thu, 8 Feb 2018 15:21:46 +0000 (18:21 +0300)]
build: eliminate c++17 Python build warning

6 years agocmake: update adding of extra compiler flags
Alexander Alekhin [Wed, 7 Feb 2018 16:15:47 +0000 (19:15 +0300)]
cmake: update adding of extra compiler flags

Read flags from 'cache' instead of resetting them

6 years agoocl: allow recursive UMatData lock() calls with the same objects
Alexander Alekhin [Fri, 9 Feb 2018 10:58:29 +0000 (13:58 +0300)]
ocl: allow recursive UMatData lock() calls with the same objects

OpenCLAllocator::copy() may call upload()/download() methods

6 years agoMobileNet-SSD from TensorFlow 1.3 and Inception-V2-SSD using Inference Engine backend
Dmitry Kurtaev [Wed, 7 Feb 2018 08:28:45 +0000 (11:28 +0300)]
MobileNet-SSD from TensorFlow 1.3 and Inception-V2-SSD using Inference Engine backend

6 years agoMerge pull request #10646 from take1014:master
take1014 [Thu, 8 Feb 2018 19:54:43 +0000 (04:54 +0900)]
Merge pull request #10646 from take1014:master

* Add a new interface for hough transform

* Fixed warning code

* Fix HoughLinesUsingSetOfPoints based on HoughLinesStandard

* Delete memset

* Rename HoughLinesUsingSetOfPoints and add common function

* Fix test error

* Change static function name

* Change using CV_Assert instead of if-block and add integer test case

* I solve the conflict and delete 'std :: tr1' and changed it to use 'tuple'

* I deleted std::tr1::get and changed int to use 'get'

* Fixed sample code

* revert test_main.cpp

* Delete sample code in comment and add snippets

* Change file name

* Delete static function

* Fixed build error

6 years agoMerge pull request #10814 from luzpaz:opencv-misc-apps-docs-platforms-typos
Alexander Alekhin [Thu, 8 Feb 2018 19:14:30 +0000 (19:14 +0000)]
Merge pull request #10814 from luzpaz:opencv-misc-apps-docs-platforms-typos

6 years agoMisc. ./apps ./doc ./platoforms typos
luz.paz [Thu, 8 Feb 2018 18:04:25 +0000 (13:04 -0500)]
Misc. ./apps ./doc ./platoforms typos

Found via `codespell -q 3 --skip="./3rdparty" -I ../opencv-whitelist.txt`

6 years agoMerge pull request #10812 from luzpaz:opencv-misc-samples-dir-typos
Alexander Alekhin [Thu, 8 Feb 2018 12:07:14 +0000 (12:07 +0000)]
Merge pull request #10812 from luzpaz:opencv-misc-samples-dir-typos