platform/upstream/opencv.git
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 #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 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)

5 years agoMerge pull request #12379 from alalek:fix_warning_win32
Alexander Alekhin [Sun, 2 Sep 2018 11:50:32 +0000 (11:50 +0000)]
Merge pull request #12379 from alalek:fix_warning_win32

5 years agoimgcodecs(webp): use safe cast to size_t on Win32
Alexander Alekhin [Sun, 2 Sep 2018 09:53:41 +0000 (09:53 +0000)]
imgcodecs(webp): use safe cast to size_t on Win32

5 years agoMerge pull request #12362 from alalek:fix_js_headers
Alexander Alekhin [Sun, 2 Sep 2018 04:15:16 +0000 (04:15 +0000)]
Merge pull request #12362 from alalek:fix_js_headers

5 years agocore: add solveLP type checks for output
Alexander Alekhin [Sat, 1 Sep 2018 14:31:15 +0000 (14:31 +0000)]
core: add solveLP type checks for output

to forbid Mat1f

Checks are not reliable: empty uninitialized `cv::Mat` has `CV_8UC1` type

5 years agocalib3d: use `Mat::reserveBuffer()` instead of `.create()`
Alexander Alekhin [Sat, 1 Sep 2018 13:18:08 +0000 (13:18 +0000)]
calib3d: use `Mat::reserveBuffer()` instead of `.create()`

to allocate memory >2Gb

5 years agoimgproc: small code refactoring (findContours -> l_cinfo)
Alexander Alekhin [Sat, 1 Sep 2018 12:25:10 +0000 (12:25 +0000)]
imgproc: small code refactoring (findContours -> l_cinfo)

5 years agoimgproc(segmentation): don't increase mask NULL pointer
Alexander Alekhin [Sat, 1 Sep 2018 12:38:57 +0000 (12:38 +0000)]
imgproc(segmentation): don't increase mask NULL pointer

Avoid manual address arithmetic

5 years agoMerge pull request #12350 from dkurt:dnn_ie_caffe_faster_rcnn
Vadim Pisarevsky [Fri, 31 Aug 2018 14:57:14 +0000 (14:57 +0000)]
Merge pull request #12350 from dkurt:dnn_ie_caffe_faster_rcnn

5 years agodoc: add new tutorial motion deblur filter (#12215)
Vlad Karpushin [Fri, 31 Aug 2018 14:41:22 +0000 (21:41 +0700)]
doc: add new tutorial motion deblur filter (#12215)

* doc: add new tutorial motion deblur filter

* Update motion_deblur_filter.markdown

a few minor changes

5 years agodoc: fix English gramma in tutorial out-of-focus-deblur filter (#12214)
Vlad Karpushin [Fri, 31 Aug 2018 14:24:37 +0000 (21:24 +0700)]
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

5 years agoBit-exact GaussianBlur reworked to use wide intrinsics (#12073)
Vitaly Tuzov [Fri, 31 Aug 2018 14:05:00 +0000 (17:05 +0300)]
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

5 years agoBit-exact resize reworked to use wide intrinsics (#12038)
Vitaly Tuzov [Fri, 31 Aug 2018 13:54:05 +0000 (16:54 +0300)]
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

5 years agoMerge pull request #12142 from alalek:dnn_ocl_fix_convolution_perf_tests
Alexander Alekhin [Fri, 31 Aug 2018 13:27:14 +0000 (13:27 +0000)]
Merge pull request #12142 from alalek:dnn_ocl_fix_convolution_perf_tests

5 years agoml: fix adjusting K in KNearest (#12358)
berak [Fri, 31 Aug 2018 13:07:53 +0000 (15:07 +0200)]
ml: fix adjusting K in KNearest (#12358)

5 years agoMerge pull request #12353 from alalek:imgcodecs_fix_webp
Vadim Pisarevsky [Fri, 31 Aug 2018 13:03:10 +0000 (13:03 +0000)]
Merge pull request #12353 from alalek:imgcodecs_fix_webp

5 years agoMerge pull request #12348 from take1014:subdiv_getTriangleList_5788
Vadim Pisarevsky [Fri, 31 Aug 2018 13:01:15 +0000 (13:01 +0000)]
Merge pull request #12348 from take1014:subdiv_getTriangleList_5788

5 years agoMerge pull request #12341 from terfendail:countnonzero_wintr
Vadim Pisarevsky [Fri, 31 Aug 2018 12:58:25 +0000 (12:58 +0000)]
Merge pull request #12341 from terfendail:countnonzero_wintr

5 years agoInclude preprocessing nodes to object detection TensorFlow networks (#12211)
Dmitry Kurtaev [Fri, 31 Aug 2018 12:41:56 +0000 (15:41 +0300)]
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

5 years agoMerge pull request #12360 from alalek:issue_12356
Alexander Alekhin [Fri, 31 Aug 2018 12:16:50 +0000 (12:16 +0000)]
Merge pull request #12360 from alalek:issue_12356

5 years agodnn(test): use dnnBackendsAndTargets() param generator
Alexander Alekhin [Thu, 30 Aug 2018 14:53:41 +0000 (17:53 +0300)]
dnn(test): use dnnBackendsAndTargets() param generator

5 years agodnn(perf): fix and merge Convolution tests
Alexander Alekhin [Thu, 2 Aug 2018 14:59:45 +0000 (17:59 +0300)]
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

5 years agojs: use generated list of OpenCV headers
Alexander Alekhin [Fri, 31 Aug 2018 11:48:44 +0000 (14:48 +0300)]
js: use generated list of OpenCV headers

- replaces hand-written list

5 years agoimgcodecs: add null pointer check
Alexander Alekhin [Fri, 31 Aug 2018 09:56:02 +0000 (12:56 +0300)]
imgcodecs: add null pointer check

5 years agoimgcodecs(webp): multiple fixes
Alexander Alekhin [Thu, 30 Aug 2018 19:12:01 +0000 (19:12 +0000)]
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

5 years agoMerge pull request #12189 from alalek:ippa_cleanup_3.4
Alexander Alekhin [Thu, 30 Aug 2018 20:29:42 +0000 (20:29 +0000)]
Merge pull request #12189 from alalek:ippa_cleanup_3.4

5 years agoMerge pull request #12351 from NobuoTsukamoto:3.4
Alexander Alekhin [Thu, 30 Aug 2018 18:10:01 +0000 (21:10 +0300)]
Merge pull request #12351 from NobuoTsukamoto:3.4

5 years agocountNonZero function reworked to use wide universal intrinsics instead of SSE2 intri...
Vitaly Tuzov [Wed, 29 Aug 2018 17:31:15 +0000 (20:31 +0300)]
countNonZero function reworked to use wide universal intrinsics instead of SSE2 intrinsics

5 years agoresolve #5788
take1014 [Thu, 30 Aug 2018 15:59:00 +0000 (00:59 +0900)]
resolve #5788

5 years agocleanup: IPP Async (IPP_A)
Alexander Alekhin [Thu, 30 Aug 2018 15:53:07 +0000 (18:53 +0300)]
cleanup: IPP Async (IPP_A)

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

5 years agoMerge pull request #12346 from mshabunin:test-data-check
Alexander Alekhin [Thu, 30 Aug 2018 15:36:58 +0000 (15:36 +0000)]
Merge pull request #12346 from mshabunin:test-data-check

5 years agoFixed that object_detection.py does not work in python3.
Nobuo Tsukamoto [Thu, 30 Aug 2018 15:21:54 +0000 (00:21 +0900)]
Fixed that object_detection.py does not work in python3.

5 years agoReplace Slice layer to Crop in Faster-RCNN networks from Caffe
Dmitry Kurtaev [Wed, 29 Aug 2018 13:33:54 +0000 (16:33 +0300)]
Replace Slice layer to Crop in Faster-RCNN networks from Caffe

5 years agoMerge pull request #12327 from take1014:distanceTransform_type
Vadim Pisarevsky [Thu, 30 Aug 2018 13:12:07 +0000 (13:12 +0000)]
Merge pull request #12327 from take1014:distanceTransform_type

5 years agoMerge pull request #12345 from berak:fix_java_list_string
Alexander Alekhin [Thu, 30 Aug 2018 13:04:18 +0000 (13:04 +0000)]
Merge pull request #12345 from berak:fix_java_list_string

5 years agoMerge pull request #12314 from sturkmen72:patch-2
Vadim Pisarevsky [Thu, 30 Aug 2018 12:44:23 +0000 (12:44 +0000)]
Merge pull request #12314 from sturkmen72:patch-2

5 years agoAdds a small note describing BUILD_opencv_world (#12332)
HarshDolhare [Thu, 30 Aug 2018 12:17:27 +0000 (17:47 +0530)]
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

5 years agoAdded option to fail on missing testdata
Maksim Shabunin [Thu, 30 Aug 2018 10:06:26 +0000 (13:06 +0300)]
Added option to fail on missing testdata

5 years agoMerge pull request #12336 from dkurt:dnn_ie_fix_net_lifetime
Alexander Alekhin [Thu, 30 Aug 2018 11:09:18 +0000 (11:09 +0000)]
Merge pull request #12336 from dkurt:dnn_ie_fix_net_lifetime

5 years agoMerge pull request #12333 from wzw-intel:prior_box
Alexander Alekhin [Thu, 30 Aug 2018 11:08:44 +0000 (11:08 +0000)]
Merge pull request #12333 from wzw-intel:prior_box

5 years agojava: fix LIST_GET macro
berak [Thu, 30 Aug 2018 08:50:25 +0000 (10:50 +0200)]
java: fix LIST_GET macro

5 years agodnn: fix variance setting bug for PriorBoxLayer
Wu Zhiwen [Wed, 29 Aug 2018 03:47:13 +0000 (11:47 +0800)]
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>
5 years agoFix lifetime of networks which are loaded from Model Optimizer IRs
Dmitry Kurtaev [Wed, 29 Aug 2018 10:26:43 +0000 (13:26 +0300)]
Fix lifetime of networks which are loaded from Model Optimizer IRs

5 years agofix typo
take1014 [Tue, 28 Aug 2018 13:14:47 +0000 (22:14 +0900)]
fix typo

5 years agoMerge tag '3.4.3-openvino'
Alexander Alekhin [Tue, 28 Aug 2018 13:03:30 +0000 (16:03 +0300)]
Merge tag '3.4.3-openvino'

5 years agoMerge tag '3.4.3'
Alexander Alekhin [Tue, 28 Aug 2018 13:02:39 +0000 (16:02 +0300)]
Merge tag '3.4.3'

5 years agoOpenCV 3.4.3
Alexander Alekhin [Tue, 28 Aug 2018 12:58:21 +0000 (15:58 +0300)]
OpenCV 3.4.3

5 years agoopenvino: use 2018R3 defines
Alexander Alekhin [Tue, 7 Aug 2018 12:01:36 +0000 (15:01 +0300)]
openvino: use 2018R3 defines

5 years agoMerge pull request #12326 from alalek:issue_12325
Alexander Alekhin [Tue, 28 Aug 2018 12:51:33 +0000 (12:51 +0000)]
Merge pull request #12326 from alalek:issue_12325

5 years agoMerge pull request #12319 from dkurt:dnn_enable_ie_tests
Alexander Alekhin [Tue, 28 Aug 2018 12:50:31 +0000 (12:50 +0000)]
Merge pull request #12319 from dkurt:dnn_enable_ie_tests

5 years agoMerge pull request #12323 from alalek:android_ndk17_support
Alexander Alekhin [Tue, 28 Aug 2018 12:09:13 +0000 (12:09 +0000)]
Merge pull request #12323 from alalek:android_ndk17_support

5 years agots: don't pass NULL for std::string() constructor
Alexander Alekhin [Tue, 28 Aug 2018 11:19:56 +0000 (14:19 +0300)]
ts: don't pass NULL for std::string() constructor

5 years agoandroid: NDK17 support
Alexander Alekhin [Mon, 27 Aug 2018 21:06:42 +0000 (21:06 +0000)]
android: NDK17 support

tested with NDK 17b (17.1.4828580)

5 years agoMerge pull request #12193 from alalek:fix_vaapi_sample
Alexander Alekhin [Mon, 27 Aug 2018 20:56:19 +0000 (20:56 +0000)]
Merge pull request #12193 from alalek:fix_vaapi_sample

5 years agoMerge pull request #12286 from logic1988:master
Alexander Alekhin [Mon, 27 Aug 2018 19:05:23 +0000 (19:05 +0000)]
Merge pull request #12286 from logic1988:master

5 years agoEnable more deep learning tests using Intel's Inference Engine backend
Dmitry Kurtaev [Mon, 27 Aug 2018 12:45:44 +0000 (15:45 +0300)]
Enable more deep learning tests using Intel's Inference Engine backend

5 years agoUpdate opengl_interop.cpp
Suleyman TURKMEN [Sun, 26 Aug 2018 22:04:46 +0000 (01:04 +0300)]
Update opengl_interop.cpp

resolves #12307

5 years agoMerge pull request #12306 from berak:python_nmsboxes
Alexander Alekhin [Sat, 25 Aug 2018 16:35:00 +0000 (16:35 +0000)]
Merge pull request #12306 from berak:python_nmsboxes

5 years agoMerge pull request #12308 from StrangeTcy:patch-1
Alexander Alekhin [Sat, 25 Aug 2018 16:32:32 +0000 (16:32 +0000)]
Merge pull request #12308 from StrangeTcy:patch-1

5 years ago`CV_Assert`s changed
Maxim Smirnov [Sat, 25 Aug 2018 11:52:27 +0000 (14:52 +0300)]
`CV_Assert`s changed

Some `CV_Assert`s changed to `CV_Assert_N`s according to https://github.com/opencv/opencv/issues/12304