platform/upstream/opencv.git
5 years agoMerge pull request #12522 from mshabunin:remove-va-msdk-34
Alexander Alekhin [Thu, 13 Sep 2018 14:15:59 +0000 (14:15 +0000)]
Merge pull request #12522 from mshabunin:remove-va-msdk-34

5 years agoMerge pull request #12515 from hmaarrfk:fix_bayer2rgba_blue_channel
Alexander Alekhin [Thu, 13 Sep 2018 12:53:08 +0000 (12:53 +0000)]
Merge pull request #12515 from hmaarrfk:fix_bayer2rgba_blue_channel

5 years agoMerge pull request #12410 from terfendail:sum_wintr
Alexander Alekhin [Thu, 13 Sep 2018 12:49:56 +0000 (15:49 +0300)]
Merge pull request #12410 from terfendail:sum_wintr

5 years agoRemoved unnecessary build-time MediaSDK detection
Maksim Shabunin [Thu, 13 Sep 2018 09:46:06 +0000 (12:46 +0300)]
Removed unnecessary build-time MediaSDK detection

5 years agoMerge pull request #12511 from GeorgeMironov:rename-tf-namespace
Alexander Alekhin [Wed, 12 Sep 2018 20:13:43 +0000 (20:13 +0000)]
Merge pull request #12511 from GeorgeMironov:rename-tf-namespace

5 years agoFix BayerXX2RGBA when blue is on the first line.
Mark Harfouche [Wed, 12 Sep 2018 18:47:00 +0000 (14:47 -0400)]
Fix BayerXX2RGBA when blue is on the first line.

5 years agodnn(tensorflow): re-generate files using protoc
Alexander Alekhin [Wed, 12 Sep 2018 18:33:45 +0000 (21:33 +0300)]
dnn(tensorflow): re-generate files using protoc

5 years agoRename tensorflow namespace
George Mironov [Wed, 12 Sep 2018 12:08:56 +0000 (15:08 +0300)]
Rename tensorflow namespace

5 years agoMerge pull request #12501 from alalek:fix_qt_build
Alexander Alekhin [Wed, 12 Sep 2018 17:14:23 +0000 (17:14 +0000)]
Merge pull request #12501 from alalek:fix_qt_build

5 years agoMerge pull request #12507 from cv3d:fix_warnings
Alexander Alekhin [Wed, 12 Sep 2018 17:12:46 +0000 (17:12 +0000)]
Merge pull request #12507 from cv3d:fix_warnings

5 years agoMerge pull request #12497 from tomoaki0705:removeRawSSE
Vadim Pisarevsky [Wed, 12 Sep 2018 11:59:43 +0000 (11:59 +0000)]
Merge pull request #12497 from tomoaki0705:removeRawSSE

5 years agoMerge pull request #12204 from allnes:detect_qr_code
Vadim Pisarevsky [Wed, 12 Sep 2018 11:55:44 +0000 (11:55 +0000)]
Merge pull request #12204 from allnes:detect_qr_code

5 years agoMSVC: Slience external/meaningless warnings
Hamdi Sahloul [Wed, 12 Sep 2018 04:23:36 +0000 (13:23 +0900)]
MSVC: Slience external/meaningless warnings

5 years agoMerge pull request #12249 from kopytjuk:feature/region-layer-batch-mode
Marat K [Wed, 12 Sep 2018 10:29:43 +0000 (12:29 +0200)]
Merge pull request #12249 from kopytjuk:feature/region-layer-batch-mode

Feature/region layer batch mode (#12249)

* Add batch mode for Darknet networks.

Swap variables in test_darknet.

Adapt reorg layer to batch mode.

Adapt region layer.

Add OpenCL implementation.

Remove trailing whitespace.

Bugifx reorg opencl implementation.

Fix bug in OpenCL reorg.

Fix modulo bug.

Fix bug.

Reorg openCL.

Restore reorg layer opencl code.

OpenCl fix.

Work on openCL reorg.

Remove whitespace.

Fix openCL region layer implementation.

Fix bug.

Fix softmax region opencl bug.

Fix opencl bug.

Fix openCL bug.

Update aff_trans.cpp

When the fullAffine parameter is set to false, the estimateRigidTransform function maybe return empty, then the _localAffineEstimate function will be called, but the bug in it will result in incorrect results.

core(libva): support YV12 too

Added to CPU path only.
OpenCL code path still expects NV12 only (according to Intel OpenCL extension)

cmake: allow to specify own libva paths

via CMake:
- `-DVA_LIBRARIES=/opt/intel/mediasdk/lib64/libva.so.2\;/opt/intel/mediasdk/lib64/libva-drm.so.2`

android: NDK17 support

tested with NDK 17b (17.1.4828580)

Enable more deep learning tests using Intel's Inference Engine backend

ts: don't pass NULL for std::string() constructor

openvino: use 2018R3 defines

experimental version++

OpenCV version++

OpenCV 3.4.3

OpenCV version '-openvino'

openvino: use 2018R3 defines

Fixed windows build with InferenceEngine

dnn: fix variance setting bug for PriorBoxLayer

- The size of second channel should be size[2] of output tensor,
- The Scalar should be {variance[0], variance[0], variance[0], variance[0]}
  for _variance.size() == 1 case.

Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Fix lifetime of networks which are loaded from Model Optimizer IRs

Adds a small note describing BUILD_opencv_world (#12332)

* Added a mall note describing BUILD_opencv_world cmake option to the Installation in Windows tutorial.

* Made slight changes in BUILD_opencv_world documentation.

* Update windows_install.markdown

improved grammar

Update opengl_interop.cpp

resolves #12307

java: fix LIST_GET macro

fix typo

Added option to fail on missing testdata

Fixed that object_detection.py does not work in python3.

cleanup: IPP Async (IPP_A)

except header file with conversion routines (will be removed in OpenCV 4.0)

imgcodecs: add null pointer check

Include preprocessing nodes to object detection TensorFlow networks (#12211)

* Include preprocessing nodes to object detection TensorFlow networks

* Enable more fusion

* faster_rcnn_resnet50_coco_2018_01_28 test

countNonZero function reworked to use wide universal intrinsics instead of SSE2 intrinsics

resolve #5788

imgcodecs(webp): multiple fixes

- don't reallocate passed 'img' (test fixed - must use IMREAD_UNCHANGED / IMREAD_ANYCOLOR)
- avoid memory DDOS
- avoid reading of whole file during header processing
- avoid data access after allocated buffer during header processing (missing checks)
- use WebPFree() to free allocated buffers (libwebp >= 0.5.0)
- drop unused & undefined `.close()` method
- added checks for channels >= 5 in encoder

ml: fix adjusting K in KNearest (#12358)

dnn(perf): fix and merge Convolution tests

- OpenCL tests didn't run any OpenCL kernels
- use real configuration from existed models (the first 100 cases)
- batch size = 1

dnn(test): use dnnBackendsAndTargets() param generator

Bit-exact resize reworked to use wide intrinsics (#12038)

* Bit-exact resize reworked to use wide intrinsics

* Reworked bit-exact resize row data loading

* Added bit-exact resize row data loaders for SIMD256 and SIMD512

* Fixed type punned pointer dereferencing warning

* Reworked loading of source data for SIMD256 and SIMD512 bit-exact resize

Bit-exact GaussianBlur reworked to use wide intrinsics (#12073)

* Bit-exact GaussianBlur reworked to use wide intrinsics

* Added v_mul_hi universal intrinsic

* Removed custom SSE2 branch from bit-exact GaussianBlur

* Removed loop unrolling for gaussianBlur horizontal smoothing

doc: fix English gramma in tutorial out-of-focus-deblur filter (#12214)

* doc: fix English gramma in tutorial out-of-focus-deblur filter

* Update out_of_focus_deblur_filter.markdown

slightly modified one sentence

doc: add new tutorial motion deblur filter (#12215)

* doc: add new tutorial motion deblur filter

* Update motion_deblur_filter.markdown

a few minor changes

Replace Slice layer to Crop in Faster-RCNN networks from Caffe

js: use generated list of OpenCV headers

- replaces hand-written list

imgcodecs(webp): use safe cast to size_t on Win32

* Put Version status back to -dev.

follow the common codestyle

Exclude some target engines.

Refactor formulas.

Refactor code.

* Remove unused variable.

* Remove inference engine check for yolov2.

* Alter darknet batch tests to test with two different images.

* Add yolov3 second image GT.

* Fix bug.

* Fix bug.

* Add second test.

* Remove comment.

* Add NMS on network level.

* Add helper files to dev.

* syntax fix.

* Fix OD sample.

Fix sample dnn object detection.

Fix NMS boxes bug.

remove trailing whitespace.

Remove debug function.

Change thresholds for opencl tests.

* Adapt score diff and iou diff.

* Alter iouDiffs.

* Add debug messages.

* Adapt iouDiff.

* Fix tests

5 years agoMerge pull request #12206 from jsxyhelu/3.4
jsxyhelu [Tue, 11 Sep 2018 20:58:01 +0000 (04:58 +0800)]
Merge pull request #12206 from jsxyhelu/3.4

find innercircle of contour by using pointPolygonTest: (#12206)

5 years agohighgui: fix QT build
Alexander Alekhin [Tue, 11 Sep 2018 20:30:36 +0000 (20:30 +0000)]
highgui: fix QT build

5 years agoMerge pull request #12494 from DEEPIR:3.4
Alexander Alekhin [Tue, 11 Sep 2018 19:38:00 +0000 (19:38 +0000)]
Merge pull request #12494 from DEEPIR:3.4

5 years agoMerge pull request #12479 from sturkmen72:patch-2
Alexander Alekhin [Tue, 11 Sep 2018 19:33:50 +0000 (19:33 +0000)]
Merge pull request #12479 from sturkmen72:patch-2

5 years agoremove raw SSE2 implementation
Tomoaki Teshima [Tue, 11 Sep 2018 12:28:18 +0000 (21:28 +0900)]
remove raw SSE2 implementation

5 years agoOptimiaztion search template lines and added sample
Alexander Nesterov [Tue, 7 Aug 2018 14:37:51 +0000 (11:37 -0300)]
Optimiaztion search template lines and added sample

5 years agofix uninitialized read errors reported by CUDA-INITCHECK
cyy [Tue, 11 Sep 2018 06:47:39 +0000 (14:47 +0800)]
fix uninitialized read errors reported by CUDA-INITCHECK

5 years agoMerge pull request #12482 from GeorgeMironov:protobuf-cmake-fix
Alexander Alekhin [Tue, 11 Sep 2018 06:35:47 +0000 (06:35 +0000)]
Merge pull request #12482 from GeorgeMironov:protobuf-cmake-fix

5 years agoMerge pull request #12483 from terfendail:meanstddev_multichan
Alexander Alekhin [Mon, 10 Sep 2018 19:27:50 +0000 (19:27 +0000)]
Merge pull request #12483 from terfendail:meanstddev_multichan

5 years agoMerge pull request #12071 from l-bat/l-bat:onnx_parser
Lubov Batanina [Mon, 10 Sep 2018 18:07:51 +0000 (21:07 +0300)]
Merge pull request #12071 from l-bat/l-bat:onnx_parser

* Add Squeezenet support in ONNX

* Add AlexNet support in ONNX

* Add Googlenet support in ONNX

* Add CaffeNet and RCNN support in ONNX

* Add VGG16 and VGG16 with batch normalization support in ONNX

* Add RCNN, ZFNet, ResNet18v1 and ResNet50v1 support in ONNX

* Add ResNet101_DUC_HDC

* Add Tiny Yolov2

* Add CNN_MNIST, MobileNetv2 and LResNet100 support in ONNX

* Add ONNX models for emotion recognition

* Add DenseNet121 support in ONNX

* Add Inception v1 support in ONNX

* Refactoring

* Fix tests

* Fix tests

* Skip unstable test

* Modify Reshape operation

5 years agosum() implementation updated to use wide universal intrinsics
Vitaly Tuzov [Tue, 4 Sep 2018 13:37:39 +0000 (16:37 +0300)]
sum() implementation updated to use wide universal intrinsics

5 years agoFixed meanStdDev() implementation for the case input matrix has more than 4 channels
Vitaly Tuzov [Mon, 10 Sep 2018 17:05:45 +0000 (20:05 +0300)]
Fixed meanStdDev() implementation for the case input matrix has more than 4 channels

5 years agoUpdate hog.cpp
Suleyman TURKMEN [Mon, 10 Sep 2018 01:02:27 +0000 (04:02 +0300)]
Update hog.cpp

5 years agoFix include paths when building with external protobuf
George Mironov [Mon, 10 Sep 2018 13:09:45 +0000 (16:09 +0300)]
Fix include paths when building with external protobuf

5 years agoMerge pull request #12054 from alalek:debug_bindings
Alexander Alekhin [Mon, 10 Sep 2018 10:44:32 +0000 (10:44 +0000)]
Merge pull request #12054 from alalek:debug_bindings

5 years agoMerge pull request #12475 from sturkmen72:patch-1
Alexander Alekhin [Sun, 9 Sep 2018 20:16:47 +0000 (20:16 +0000)]
Merge pull request #12475 from sturkmen72:patch-1

5 years agoMerge pull request #12473 from cv3d:cmake/python_detection
Alexander Alekhin [Sun, 9 Sep 2018 20:16:28 +0000 (20:16 +0000)]
Merge pull request #12473 from cv3d:cmake/python_detection

5 years agoCMAKE: Improve python detection
Hamdi Sahloul [Sun, 9 Sep 2018 04:47:03 +0000 (13:47 +0900)]
CMAKE: Improve python detection

5 years agoUpdate window.cpp
Suleyman TURKMEN [Sun, 9 Sep 2018 14:49:09 +0000 (17:49 +0300)]
Update window.cpp

5 years agobindings: add debug helpers for args conversions
Alexander Alekhin [Tue, 24 Jul 2018 18:31:40 +0000 (18:31 +0000)]
bindings: add debug helpers for args conversions

5 years agoMerge pull request #12465 from hmaarrfk:fix_bayer2rgba
Alexander Alekhin [Sat, 8 Sep 2018 11:44:04 +0000 (11:44 +0000)]
Merge pull request #12465 from hmaarrfk:fix_bayer2rgba

5 years agoOutput RGBA images when bayer_xx2YYYA is called
Mark Harfouche [Fri, 7 Sep 2018 19:57:55 +0000 (15:57 -0400)]
Output RGBA images when bayer_xx2YYYA is called

5 years agoMerge pull request #12458 from DEEPIR:3.4
cyy [Fri, 7 Sep 2018 15:43:47 +0000 (23:43 +0800)]
Merge pull request #12458 from DEEPIR:3.4

* may be an typo fix

* remove identical branch,may be paste error

* add parentheses around macro parameter

* simplify if condition

* check malloc fail

* change the condition of branch removed by commit 3041502861318c85d901e8c08226ff67898c77ed

5 years agoMerge pull request #12460 from cv3d:lint_unused
Alexander Alekhin [Fri, 7 Sep 2018 13:03:44 +0000 (13:03 +0000)]
Merge pull request #12460 from cv3d:lint_unused

5 years agoUtilize CV_UNUSED macro
Hamdi Sahloul [Fri, 7 Sep 2018 11:33:52 +0000 (20:33 +0900)]
Utilize CV_UNUSED macro

5 years agoMerge pull request #12459 from alalek:fix_cuda_build
Alexander Alekhin [Fri, 7 Sep 2018 09:27:31 +0000 (09:27 +0000)]
Merge pull request #12459 from alalek:fix_cuda_build

5 years agocuda: fix build (legacy C-API usage)
Alexander Alekhin [Fri, 7 Sep 2018 07:26:17 +0000 (07:26 +0000)]
cuda: fix build (legacy C-API usage)

5 years agoMerge pull request #12446 from alalek:imgproc_grabcut_numeric_issues
Alexander Alekhin [Thu, 6 Sep 2018 20:18:45 +0000 (20:18 +0000)]
Merge pull request #12446 from alalek:imgproc_grabcut_numeric_issues

5 years agoMerge pull request #12443 from DEEPIR:master
cyy [Thu, 6 Sep 2018 20:09:39 +0000 (04:09 +0800)]
Merge pull request #12443 from DEEPIR:master

* simplify condition

* dims must > 0 or latter sz[dims-1] will underflow

5 years agoMerge pull request #11630 from alalek:c_api_eliminate_constructors
Alexander Alekhin [Thu, 6 Sep 2018 20:07:16 +0000 (20:07 +0000)]
Merge pull request #11630 from alalek:c_api_eliminate_constructors

5 years agoMerge pull request #12411 from vpisarev:wide_convert
Vadim Pisarevsky [Thu, 6 Sep 2018 16:36:59 +0000 (19:36 +0300)]
Merge pull request #12411 from vpisarev:wide_convert

* rewrote Mat::convertTo() and convertScaleAbs() to wide universal intrinsics; added always-available and SIMD-optimized FP16<=>FP32 conversion

* fixed compile warnings

* fix some more compile errors

* slightly relaxed accuracy threshold for int->float conversion (since we now do it using single-precision arithmetics, not double-precision)

* fixed compile errors on iOS, Android and in the baseline C++ version (intrin_cpp.hpp)

* trying to fix ARM-neon builds

* trying to fix ARM-neon builds

* trying to fix ARM-neon builds

* trying to fix ARM-neon builds

5 years agoMerge pull request #12437 from vpisarev:avx2_fixes
Vadim Pisarevsky [Thu, 6 Sep 2018 15:56:55 +0000 (18:56 +0300)]
Merge pull request #12437 from vpisarev:avx2_fixes

* trying to fix the custom AVX2 builder test failures (false alarms)

* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests

* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests

* fixed compile error with CPU_BASELINE=AVX2 on x86; raised tolerance thresholds in a couple of tests

* seemingly disabled false alarm warning in surf.cpp; increased tolerance thresholds in the tests for SolvePnP and in DNN/ENet

5 years agoimgproc: grabcut numeric stability
Alexander Alekhin [Thu, 6 Sep 2018 14:05:54 +0000 (17:05 +0300)]
imgproc: grabcut numeric stability

5 years agodon't use constructors for C API structures
Alexander Alekhin [Thu, 6 Sep 2018 11:34:16 +0000 (14:34 +0300)]
don't use constructors for C API structures

5 years agocore: remove constructors from C API structures
Alexander Alekhin [Wed, 30 May 2018 13:59:52 +0000 (16:59 +0300)]
core: remove constructors from C API structures

POD structures can't have constructors.

5 years agoMerge pull request #12440 from woodychow:fix_normL2Sqr_speed_regression_3.4
Alexander Alekhin [Thu, 6 Sep 2018 10:33:33 +0000 (10:33 +0000)]
Merge pull request #12440 from woodychow:fix_normL2Sqr_speed_regression_3.4

5 years agoMerge pull request #12264 from dkurt:dnn_remove_forward_method
Dmitry Kurtaev [Thu, 6 Sep 2018 10:26:47 +0000 (13:26 +0300)]
Merge pull request #12264 from dkurt:dnn_remove_forward_method

* Remove a forward method in dnn::Layer

* Add a test

* Fix tests

* Mark multiple dnn::Layer::finalize methods as deprecated

* Replace back dnn's inputBlobs to vector of pointers

* Remove Layer::forward_fallback from CV_OCL_RUN scopes

5 years agoReplace naive normL2Sqr with hal::normL2Sqr_ for better performance
woody.chow [Thu, 6 Sep 2018 08:43:07 +0000 (17:43 +0900)]
Replace naive normL2Sqr with hal::normL2Sqr_ for better performance

5 years agoMerge pull request #12434 from alalek:pr12414_rebased
Alexander Alekhin [Wed, 5 Sep 2018 16:46:36 +0000 (16:46 +0000)]
Merge pull request #12434 from alalek:pr12414_rebased

5 years agoMerge pull request #12355 from sturkmen72:update_samples
Alexander Alekhin [Wed, 5 Sep 2018 16:24:02 +0000 (16:24 +0000)]
Merge pull request #12355 from sturkmen72:update_samples

5 years agoTo fix bug #12389, which is a validation for the potential null pointer.
Zhenqing Hu [Tue, 4 Sep 2018 18:35:57 +0000 (14:35 -0400)]
To fix bug #12389, which is a validation for the potential null pointer.

Signed-off-by: Zhenqing Hu <huzq85@gmail.com>
5 years agoMerge pull request #12433 from alalek:fix_contrib_1746
Alexander Alekhin [Wed, 5 Sep 2018 16:09:27 +0000 (16:09 +0000)]
Merge pull request #12433 from alalek:fix_contrib_1746

5 years agoUpdate samples
Suleyman TURKMEN [Sat, 25 Aug 2018 02:37:54 +0000 (05:37 +0300)]
Update samples

5 years agoimgproc: fix Subdiv2D::getTriangleList()
Alexander Alekhin [Wed, 5 Sep 2018 13:16:53 +0000 (16:16 +0300)]
imgproc: fix Subdiv2D::getTriangleList()

5 years agoMerge pull request #12408 from dkurt:dnn_myriad_batch_tests
Alexander Alekhin [Wed, 5 Sep 2018 10:04:04 +0000 (10:04 +0000)]
Merge pull request #12408 from dkurt:dnn_myriad_batch_tests

5 years agoMerge pull request #12424 from alalek:fix_build_avoid_nullptr
Alexander Alekhin [Wed, 5 Sep 2018 09:46:26 +0000 (09:46 +0000)]
Merge pull request #12424 from alalek:fix_build_avoid_nullptr

5 years agoEnable Myriad tests with batch size > 1
Dmitry Kurtaev [Tue, 4 Sep 2018 14:33:34 +0000 (17:33 +0300)]
Enable Myriad tests with batch size > 1

5 years agobuild: don't use nullptr without C++11 guard
Alexander Alekhin [Wed, 5 Sep 2018 06:19:02 +0000 (06:19 +0000)]
build: don't use nullptr without C++11 guard

5 years agoMerge pull request #12420 from cv3d:fix/gtest_vc12
Alexander Alekhin [Wed, 5 Sep 2018 06:12:09 +0000 (06:12 +0000)]
Merge pull request #12420 from cv3d:fix/gtest_vc12

5 years agoWorkaround for GTest v1.8.1 + Visual Studio 2013 (vc12)
Hamdi Sahloul [Wed, 5 Sep 2018 02:44:30 +0000 (11:44 +0900)]
Workaround for GTest v1.8.1 + Visual Studio 2013 (vc12)

5 years agoMerge pull request #12409 from dkurt:fix_12407
Alexander Alekhin [Tue, 4 Sep 2018 16:34:30 +0000 (16:34 +0000)]
Merge pull request #12409 from dkurt:fix_12407

5 years agoMerge pull request #12406 from alalek:backport_12357_12391
Alexander Alekhin [Tue, 4 Sep 2018 16:09:43 +0000 (16:09 +0000)]
Merge pull request #12406 from alalek:backport_12357_12391

5 years agoMerge pull request #12394 from alalek:imgproc_GaussianBlur_allow_HAL_8U
Alexander Alekhin [Tue, 4 Sep 2018 15:16:08 +0000 (15:16 +0000)]
Merge pull request #12394 from alalek:imgproc_GaussianBlur_allow_HAL_8U

5 years agoMerge pull request #12383 from alalek:ts_qemu_support
Alexander Alekhin [Tue, 4 Sep 2018 15:15:39 +0000 (15:15 +0000)]
Merge pull request #12383 from alalek:ts_qemu_support

5 years agoFix #12407
Dmitry Kurtaev [Tue, 4 Sep 2018 14:48:52 +0000 (17:48 +0300)]
Fix #12407

5 years agobackport fixes for static analyzer warnings
Alexander Alekhin [Tue, 4 Sep 2018 13:44:47 +0000 (16:44 +0300)]
backport fixes for static analyzer warnings

Commits:
09837928d934d104b3f327ce42122b7b8f35fff3
10fb88d02791b33d83a3756c62e21aa1c5a1e68d

Excluded changes with std::atomic (C++98 requirement)

5 years agoMerge pull request #12382 from alalek:update_gtest_1.8.1
Alexander Alekhin [Tue, 4 Sep 2018 13:28:55 +0000 (13:28 +0000)]
Merge pull request #12382 from alalek:update_gtest_1.8.1

5 years agoMerge pull request #12405 from todortomov:3.4_cap_v4l_query_conrtols
Alexander Alekhin [Tue, 4 Sep 2018 12:55:05 +0000 (12:55 +0000)]
Merge pull request #12405 from todortomov:3.4_cap_v4l_query_conrtols

5 years agoMerge pull request #12398 from alalek:samples_eliminate_cvconfig
Alexander Alekhin [Tue, 4 Sep 2018 11:38:34 +0000 (11:38 +0000)]
Merge pull request #12398 from alalek:samples_eliminate_cvconfig

5 years agoMerge pull request #12377 from alalek:inputarray_raw_wrapper_customtype
Alexander Alekhin [Tue, 4 Sep 2018 11:29:23 +0000 (11:29 +0000)]
Merge pull request #12377 from alalek:inputarray_raw_wrapper_customtype

5 years agocap_v4l: Fix private control enumeration end condition
Todor Tomov [Tue, 4 Sep 2018 08:33:08 +0000 (11:33 +0300)]
cap_v4l: Fix private control enumeration end condition

Currently the private control enumeration will be stopped when QUERYCTRL
returns -EINVAL only. It is possible however that other errors occur.

One particular case is when the v4l2 device doesn't support any controls
and doesn't implement the QUERYCTRL ioctl. In that case the v4l2
framework returns -ENOTTY. In that case the current control enumeration
will go in an endless loop.

To fix this change the control enumeration stop condition. If any errors
occur, end the control enumeration.

Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
5 years agosamples: eliminate cvconfig.h usage
Alexander Alekhin [Mon, 3 Sep 2018 18:56:04 +0000 (18:56 +0000)]
samples: eliminate cvconfig.h usage

- don't use TBB in samples

5 years agoMerge pull request #12402 from alalek:fix_build_dnn_tests
Alexander Alekhin [Tue, 4 Sep 2018 06:39:20 +0000 (06:39 +0000)]
Merge pull request #12402 from alalek:fix_build_dnn_tests

5 years agodnn: fix tests build with disabled OpenCL
Alexander Alekhin [Mon, 3 Sep 2018 23:11:25 +0000 (23:11 +0000)]
dnn: fix tests build with disabled OpenCL

5 years agoMerge pull request #12396 from LaurentBerger:I12392
Alexander Alekhin [Mon, 3 Sep 2018 20:26:14 +0000 (20:26 +0000)]
Merge pull request #12396 from LaurentBerger:I12392

5 years agoMerge pull request #12397 from terfendail:resize_wintr_fix
Alexander Alekhin [Mon, 3 Sep 2018 20:25:45 +0000 (20:25 +0000)]
Merge pull request #12397 from terfendail:resize_wintr_fix

5 years agoCUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
Alexander Alekhin [Sun, 2 Sep 2018 03:31:05 +0000 (03:31 +0000)]
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement

5 years agocore: wrap custom types via _RawArray (raw() call)
Alexander Alekhin [Sun, 2 Sep 2018 01:04:31 +0000 (01:04 +0000)]
core: wrap custom types via _RawArray (raw() call)

- support passing of `std::vector<KeyPoint>` via InputArray

5 years agoFixed bit-exact resize wide intrinsics implementation for 16U
Vitaly Tuzov [Mon, 3 Sep 2018 16:57:11 +0000 (19:57 +0300)]
Fixed bit-exact resize wide intrinsics implementation for 16U

5 years agoSolves issue 12392
LaurentBerger [Mon, 3 Sep 2018 17:30:49 +0000 (19:30 +0200)]
Solves issue 12392

5 years agoMerge pull request #12393 from peterjozsa:issue_12301
Alexander Alekhin [Mon, 3 Sep 2018 16:16:48 +0000 (16:16 +0000)]
Merge pull request #12393 from peterjozsa:issue_12301

5 years agoimgproc(GaussianBlur): restore processing order
Alexander Alekhin [Mon, 3 Sep 2018 15:39:42 +0000 (18:39 +0300)]
imgproc(GaussianBlur): restore processing order

5 years agoMerge pull request #12371 from alalek:issue_12366
Vadim Pisarevsky [Mon, 3 Sep 2018 14:30:16 +0000 (14:30 +0000)]
Merge pull request #12371 from alalek:issue_12366

5 years agoFix bug in distanceTransform (#12278)
yuki takehara [Mon, 3 Sep 2018 14:18:10 +0000 (23:18 +0900)]
Fix bug in distanceTransform (#12278)

* fix 12218

* Update test_distancetransform.cpp

marked the test as "BIGDATA_TEST" in order to skip it on low-mem platforms

* modify test

* use a smaller image in the test

* fix test code

5 years agoImport SSDs from TensorFlow by training config (#12188)
Dmitry Kurtaev [Mon, 3 Sep 2018 14:08:40 +0000 (17:08 +0300)]
Import SSDs from TensorFlow by training config (#12188)

* Remove TensorFlow and protobuf dependencies from object detection scripts

* Create text graphs for TensorFlow object detection networks from sample

5 years agoFix https://github.com/opencv/opencv/issues/12301
Peter Jozsa [Mon, 3 Sep 2018 12:56:38 +0000 (14:56 +0200)]
Fix https://github.com/opencv/opencv/issues/12301

5 years agoMerge pull request #12376 from alalek:issue_12337
Alexander Alekhin [Mon, 3 Sep 2018 10:17:56 +0000 (10:17 +0000)]
Merge pull request #12376 from alalek:issue_12337

5 years agoMerge pull request #12374 from alalek:issue_12368
Alexander Alekhin [Mon, 3 Sep 2018 10:17:09 +0000 (10:17 +0000)]
Merge pull request #12374 from alalek:issue_12368

5 years agoMerge pull request #12373 from alalek:issue_12365
Alexander Alekhin [Mon, 3 Sep 2018 10:16:51 +0000 (10:16 +0000)]
Merge pull request #12373 from alalek:issue_12365

5 years agoMerge pull request #12386 from wzw-intel:redundant_code
Alexander Alekhin [Mon, 3 Sep 2018 09:33:00 +0000 (09:33 +0000)]
Merge pull request #12386 from wzw-intel:redundant_code

5 years agodnn: Remove a duplicated code snippet for flatten layer
Wu Zhiwen [Mon, 3 Sep 2018 00:51:26 +0000 (08:51 +0800)]
dnn: Remove a duplicated code snippet for flatten layer

Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
5 years agocmake: drop unconditional forcing of CMAKE_SKIP_RPATH=TRUE
Alexander Alekhin [Sun, 2 Sep 2018 21:48:10 +0000 (21:48 +0000)]
cmake: drop unconditional forcing of CMAKE_SKIP_RPATH=TRUE

CMake "cache" entry for CMAKE_SKIP_RPATH is in the end of this file

5 years agots: support QEMU launcher
Alexander Alekhin [Fri, 31 Aug 2018 14:28:27 +0000 (17:28 +0300)]
ts: support QEMU launcher

5 years agots: re-apply OpenCV-specific patch on googletest 1.8.1
Alexander Alekhin [Sun, 2 Sep 2018 12:40:49 +0000 (12:40 +0000)]
ts: re-apply OpenCV-specific patch on googletest 1.8.1

5 years agots: update Google Test 1.8.1
Alexander Alekhin [Sun, 2 Sep 2018 12:21:29 +0000 (12:21 +0000)]
ts: update Google Test 1.8.1

Helper script from googletest: ./scripts/fuse_gtest_files.py

5 years agots: restore Google Test 1.8.0 (capture OpenCV specific patch)
Alexander Alekhin [Sun, 2 Sep 2018 12:07:15 +0000 (12:07 +0000)]
ts: restore Google Test 1.8.0 (capture OpenCV specific patch)