platform/upstream/opencv.git
6 years agoMerge pull request #11836 from terfendail:msmf_camfallback
Vadim Pisarevsky [Tue, 26 Jun 2018 12:17:55 +0000 (12:17 +0000)]
Merge pull request #11836 from terfendail:msmf_camfallback

6 years agoMerge pull request #11835 from dkurt:dnn_tf_two_inputs
Vadim Pisarevsky [Tue, 26 Jun 2018 12:12:24 +0000 (12:12 +0000)]
Merge pull request #11835 from dkurt:dnn_tf_two_inputs

6 years agoDisable MSMF VideoCapture fallback to existing camera in case provided index is out...
Vitaly Tuzov [Tue, 26 Jun 2018 11:04:02 +0000 (14:04 +0300)]
Disable MSMF VideoCapture fallback to existing camera in case provided index is out of range.

6 years agoMultiple inputs for TensorFlow models
Dmitry Kurtaev [Tue, 26 Jun 2018 10:32:28 +0000 (13:32 +0300)]
Multiple inputs for TensorFlow models

6 years agoMerge pull request #11826 from dkurt:dnn_tf_data_layouts
Vadim Pisarevsky [Tue, 26 Jun 2018 06:36:27 +0000 (06:36 +0000)]
Merge pull request #11826 from dkurt:dnn_tf_data_layouts

6 years agotemporarily disabled OpenCL use in DNN module on Mac (#11828)
Vadim Pisarevsky [Tue, 26 Jun 2018 06:35:18 +0000 (09:35 +0300)]
temporarily disabled OpenCL use in DNN module on Mac (#11828)

* temporarily disabled OpenCL use in DNN module on Mac, since some of the tests fail

* disable OpenCL in DNN on Mac at CMake level, not source level (thanks to alalek for the advice)

6 years agoUse layers consumers to predict data layout
Dmitry Kurtaev [Mon, 25 Jun 2018 12:15:25 +0000 (15:15 +0300)]
Use layers consumers to predict data layout

6 years agoupdate convolution opencl kernels in dnn module (#11762)
Li, Peng [Mon, 25 Jun 2018 14:06:18 +0000 (22:06 +0800)]
update convolution opencl kernels in dnn module (#11762)

* optimize ocl kernel enqueue in fc layer

Signed-off-by: Li Peng <peng.li@intel.com>
* use CV_LOG_INFO in convolution auto tuning

Signed-off-by: Li Peng <peng.li@intel.com>
* update convolution IDLF kernel

extend parameter tuning range, also cleanup
ocl kernel implementation

Signed-off-by: Li Peng <peng.li@intel.com>
* update in-memory convolution cache config

fp16 and fp32 cache config are stored separately

Signed-off-by: Li Peng <peng.li@intel.com>
6 years agocmake: function for application creation (#11736)
Maksim Shabunin [Mon, 25 Jun 2018 14:02:58 +0000 (17:02 +0300)]
cmake: function for application creation (#11736)

* apps: add Win32 friendly opencv_version app

Improve experience of launching app from explorer:
- application just flash (open/close) the console window
Suggested Win32 application flavor additionally shows MessageBox
and waits for User interaction.

* cmake: added unified application creation function

6 years agoMerge pull request #11743 from alalek:samples_avoid_double_VideoCapture_open
Vadim Pisarevsky [Mon, 25 Jun 2018 12:54:09 +0000 (12:54 +0000)]
Merge pull request #11743 from alalek:samples_avoid_double_VideoCapture_open

6 years agoKinect2 support added to OpenNI2 backend (#11794)
Rostislav Vasilikhin [Mon, 25 Jun 2018 10:19:20 +0000 (13:19 +0300)]
Kinect2 support added to OpenNI2 backend (#11794)

* Kinect2 support added to OpenNI2 backend

* more fixes for OpenNI2 backend

* whitespace fixed

* libfreenect2 support added

* const cast added

* mutable removed

6 years agoMerge pull request #11812 from dkurt:dnn_interp_layer_impl
Vadim Pisarevsky [Mon, 25 Jun 2018 10:16:27 +0000 (10:16 +0000)]
Merge pull request #11812 from dkurt:dnn_interp_layer_impl

6 years agoMerge pull request #11790 from berak:dnn_fix_coco_txt
Alexander Alekhin [Sat, 23 Jun 2018 18:51:06 +0000 (18:51 +0000)]
Merge pull request #11790 from berak:dnn_fix_coco_txt

6 years agoMerge pull request #11815 from tomoaki0705:suppressDeprecatedWarning
Alexander Alekhin [Sat, 23 Jun 2018 17:55:12 +0000 (17:55 +0000)]
Merge pull request #11815 from tomoaki0705:suppressDeprecatedWarning

6 years agosuppress warning while building the samples
Tomoaki Teshima [Sat, 23 Jun 2018 12:35:25 +0000 (21:35 +0900)]
suppress warning while building the samples

6 years agoMerge pull request #11808 from tomoaki0705:caroteneSuppressWarnings
Alexander Alekhin [Sat, 23 Jun 2018 08:46:29 +0000 (08:46 +0000)]
Merge pull request #11808 from tomoaki0705:caroteneSuppressWarnings

6 years agoImplement Interp layer using Resize layer
Dmitry Kurtaev [Fri, 22 Jun 2018 16:26:47 +0000 (19:26 +0300)]
Implement Interp layer using Resize layer

6 years agosuppress warning on Arm platform
Tomoaki Teshima [Fri, 22 Jun 2018 11:17:22 +0000 (20:17 +0900)]
suppress warning on Arm platform

6 years agoMerge pull request #11773 from alalek:dnn_ocl_update_force_tuning_flag
Alexander Alekhin [Fri, 22 Jun 2018 05:23:55 +0000 (05:23 +0000)]
Merge pull request #11773 from alalek:dnn_ocl_update_force_tuning_flag

6 years agodnn(ocl): fix external / predefined builtin configuration behavior
Alexander Alekhin [Fri, 15 Jun 2018 13:13:52 +0000 (16:13 +0300)]
dnn(ocl): fix external / predefined builtin configuration behavior

OPENCV_OCL4DNN_FORCE_AUTO_TUNING should ignore existed configuration from:
- builtin predefined configurations (for Intel OpenCL iGPUs)
- external configuration (via OPENCV_OCL4DNN_CONFIG_PATH)

Prefer external configuration over builtin.

6 years agoMerge pull request #11791 from dkurt:dnn_shufflenet
Alexander Alekhin [Thu, 21 Jun 2018 17:45:21 +0000 (17:45 +0000)]
Merge pull request #11791 from dkurt:dnn_shufflenet

6 years agoAdd ShuffleChannel layer
Dmitry Kurtaev [Tue, 19 Jun 2018 11:35:07 +0000 (14:35 +0300)]
Add ShuffleChannel layer

6 years agoMerge pull request #11798 from dkurt:dnn_layers_names_with_dot
Alexander Alekhin [Thu, 21 Jun 2018 11:51:54 +0000 (11:51 +0000)]
Merge pull request #11798 from dkurt:dnn_layers_names_with_dot

6 years agoRemove undocumented feature to retreive layers outputs by indices
Dmitry Kurtaev [Wed, 20 Jun 2018 11:25:24 +0000 (14:25 +0300)]
Remove undocumented feature to retreive layers outputs by indices

6 years agodnn: add a coco labels file for yolov3
berak [Tue, 19 Jun 2018 08:45:49 +0000 (10:45 +0200)]
dnn: add a coco labels file for yolov3

6 years agoMerge pull request #11775 from alalek:issue_11771
Alexander Alekhin [Sun, 17 Jun 2018 13:25:44 +0000 (13:25 +0000)]
Merge pull request #11775 from alalek:issue_11771

6 years agoMerge pull request #11774 from adamrankin:cap_dshow_autofocus
Alexander Alekhin [Sat, 16 Jun 2018 14:11:44 +0000 (14:11 +0000)]
Merge pull request #11774 from adamrankin:cap_dshow_autofocus

6 years agophoto: remove redundant broken check
Alexander Alekhin [Fri, 15 Jun 2018 16:37:58 +0000 (19:37 +0300)]
photo: remove redundant broken check

`dest(roi_d)` operation contains similar check inside.

6 years agoAdding the ability to toggle autofocus on/off for DirectShow webcams
Adam Rankin [Thu, 14 Jun 2018 22:24:14 +0000 (18:24 -0400)]
Adding the ability to toggle autofocus on/off for DirectShow webcams

6 years agoMerge pull request #11760 from vishwesh5:patch-1
Alexander Alekhin [Thu, 14 Jun 2018 15:59:48 +0000 (15:59 +0000)]
Merge pull request #11760 from vishwesh5:patch-1

6 years agoMerge pull request #11766 from dkurt:dnn_darknet_avgpool_softmax
Alexander Alekhin [Thu, 14 Jun 2018 13:18:30 +0000 (13:18 +0000)]
Merge pull request #11766 from dkurt:dnn_darknet_avgpool_softmax

6 years agoMerge pull request #11763 from dkurt:dnn_keras_relu6_v2
Alexander Alekhin [Thu, 14 Jun 2018 13:17:54 +0000 (13:17 +0000)]
Merge pull request #11763 from dkurt:dnn_keras_relu6_v2

6 years agoMerge pull request #11764 from alalek:videoio_msmf_refactor_ComPtr_wrapper
Alexander Alekhin [Thu, 14 Jun 2018 13:01:22 +0000 (13:01 +0000)]
Merge pull request #11764 from alalek:videoio_msmf_refactor_ComPtr_wrapper

6 years agoImport average pooling and softmax layers from Darknet
Dmitry Kurtaev [Thu, 14 Jun 2018 12:22:08 +0000 (15:22 +0300)]
Import average pooling and softmax layers from Darknet

6 years agovideoio(msmf): cleanup unused methods from ComPtr wrapper
Alexander Alekhin [Sun, 10 Jun 2018 12:32:09 +0000 (15:32 +0300)]
videoio(msmf): cleanup unused methods from ComPtr wrapper

Use Win32 TRUE/FALSE in SetUINT32() calls for bool parameters

6 years agoImport ClipByValue from Keras
Dmitry Kurtaev [Thu, 14 Jun 2018 10:30:30 +0000 (13:30 +0300)]
Import ClipByValue from Keras

6 years agoMerge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition
Alexander Alekhin [Thu, 14 Jun 2018 09:57:38 +0000 (09:57 +0000)]
Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition

6 years agoMerge pull request #11755 from alalek:dnn_backend_default_config
Alexander Alekhin [Thu, 14 Jun 2018 09:57:02 +0000 (09:57 +0000)]
Merge pull request #11755 from alalek:dnn_backend_default_config

6 years agoCorrected formula
vishwesh5 [Thu, 14 Jun 2018 07:00:06 +0000 (12:30 +0530)]
Corrected formula

Corrected formula for weighted within-class variance

6 years agodnn: add runtime parameter OPENCV_DNN_BACKEND_DEFAULT
Alexander Alekhin [Wed, 13 Jun 2018 15:55:31 +0000 (18:55 +0300)]
dnn: add runtime parameter OPENCV_DNN_BACKEND_DEFAULT

to control DNN_BACKEND_DEFAULT enumeration value behavior

6 years agoMerge pull request #11707 from kdpatters:patch-1
Alexander Alekhin [Wed, 13 Jun 2018 15:51:10 +0000 (15:51 +0000)]
Merge pull request #11707 from kdpatters:patch-1

6 years agoMerge pull request #11737 from alalek:videoio_msmf_replace_debug_print
Alexander Alekhin [Wed, 13 Jun 2018 13:31:31 +0000 (13:31 +0000)]
Merge pull request #11737 from alalek:videoio_msmf_replace_debug_print

6 years agovideoio(msmf): fix reopen condition in configureHW()
Alexander Alekhin [Sat, 9 Jun 2018 13:13:52 +0000 (16:13 +0300)]
videoio(msmf): fix reopen condition in configureHW()

`camid` value is always -1 after close().

6 years agoMerge pull request #11739 from dkurt:more_ie_models
Alexander Alekhin [Wed, 13 Jun 2018 13:26:50 +0000 (13:26 +0000)]
Merge pull request #11739 from dkurt:more_ie_models

6 years agoMerge pull request #11706 from take1014:setTo_Nan_10507
yuki takehara [Tue, 12 Jun 2018 18:05:44 +0000 (03:05 +0900)]
Merge pull request #11706 from take1014:setTo_Nan_10507

* setTo_#10507

* setTo_Nan_10507

* setTo: update check / test for NaNs

6 years agosamples: don't call twice of VideoCapture::open()
Alexander Alekhin [Mon, 11 Jun 2018 23:17:49 +0000 (23:17 +0000)]
samples: don't call twice of VideoCapture::open()

6 years agoMerge pull request #11740 from catree:add_tutorial_imgproc_java_python3
Alexander Alekhin [Mon, 11 Jun 2018 16:32:05 +0000 (16:32 +0000)]
Merge pull request #11740 from catree:add_tutorial_imgproc_java_python3

6 years agoAdd Java and Python code for the following imgproc tutorials: Finding contours in...
catree [Sun, 10 Jun 2018 21:57:11 +0000 (23:57 +0200)]
Add Java and Python code for the following imgproc tutorials: Finding contours in your image, Convex Hull, Creating Bounding boxes and circles for contours, Creating Bounding rotated boxes and ellipses for contours, Image Moments, Point Polygon Test.

6 years agoMerge pull request #11738 from dkurt:dnn_batch_norm_fusion_base
Alexander Alekhin [Sun, 10 Jun 2018 17:12:04 +0000 (17:12 +0000)]
Merge pull request #11738 from dkurt:dnn_batch_norm_fusion_base

6 years agoFuse top layers to batch normalization
Dmitry Kurtaev [Sat, 9 Jun 2018 15:06:53 +0000 (18:06 +0300)]
Fuse top layers to batch normalization

6 years agovideoio(msmf): replace custom debug print function
Alexander Alekhin [Sat, 9 Jun 2018 14:38:32 +0000 (17:38 +0300)]
videoio(msmf): replace custom debug print function

6 years agoMerge pull request #11723 from alalek:sample_videocapture_camera
Alexander Alekhin [Sat, 9 Jun 2018 13:49:20 +0000 (13:49 +0000)]
Merge pull request #11723 from alalek:sample_videocapture_camera

6 years agoMerge pull request #11734 from alalek:opencv_version_win32
Alexander Alekhin [Sat, 9 Jun 2018 13:48:06 +0000 (13:48 +0000)]
Merge pull request #11734 from alalek:opencv_version_win32

6 years agoEnable FastNeuralStyle and OpenFace networks with IE backend
Dmitry Kurtaev [Sat, 9 Jun 2018 12:37:04 +0000 (15:37 +0300)]
Enable FastNeuralStyle and OpenFace networks with IE backend

6 years agoapps: add Win32 friendly opencv_version app
Alexander Alekhin [Sat, 9 Jun 2018 10:59:21 +0000 (13:59 +0300)]
apps: add Win32 friendly opencv_version app

Improve experience of launching app from explorer:
- application just flash (open/close) the console window
Suggested Win32 application flavor additionally shows MessageBox
and waits for User interaction.

6 years agoMerge pull request #11729 from alalek:ffmpeg_update_3.4
Alexander Alekhin [Sat, 9 Jun 2018 12:25:23 +0000 (12:25 +0000)]
Merge pull request #11729 from alalek:ffmpeg_update_3.4

6 years agoMerge pull request #11733 from alalek:opencv_ffmpeg_download_ps1
Alexander Alekhin [Sat, 9 Jun 2018 12:11:39 +0000 (12:11 +0000)]
Merge pull request #11733 from alalek:opencv_ffmpeg_download_ps1

6 years agoMerge pull request #11732 from alalek:cmake_build_apps_list
Alexander Alekhin [Sat, 9 Jun 2018 12:10:49 +0000 (12:10 +0000)]
Merge pull request #11732 from alalek:cmake_build_apps_list

6 years agoMerge pull request #11714 from alalek:win32_waitKey_accuracy
Alexander Alekhin [Sat, 9 Jun 2018 12:10:24 +0000 (12:10 +0000)]
Merge pull request #11714 from alalek:win32_waitKey_accuracy

6 years agocmake: generate and install ffmpeg-download.ps1
Alexander Alekhin [Sat, 9 Jun 2018 10:08:50 +0000 (13:08 +0300)]
cmake: generate and install ffmpeg-download.ps1

64-bit only

6 years agocmake: add BUILD_APPS_LIST
Alexander Alekhin [Sat, 9 Jun 2018 09:48:26 +0000 (12:48 +0300)]
cmake: add BUILD_APPS_LIST

- build "opencv_version" only: `cmake -DBUILD_APPS_LIST=version ...`
- option 'BUILD_opencv_apps' should be 'ON'

6 years agoMerge pull request #11726 from catree:add_tutorial_java_ld_preload_mkl
Alexander Alekhin [Fri, 8 Jun 2018 19:10:37 +0000 (19:10 +0000)]
Merge pull request #11726 from catree:add_tutorial_java_ld_preload_mkl

6 years agoMerge pull request #11728 from dkurt:dnn_update_tf_ssd
Alexander Alekhin [Fri, 8 Jun 2018 19:04:28 +0000 (19:04 +0000)]
Merge pull request #11728 from dkurt:dnn_update_tf_ssd

6 years agoMerge pull request #11727 from alalek:videoio_msmf_use_Lock2D
Alexander Alekhin [Fri, 8 Jun 2018 19:01:40 +0000 (19:01 +0000)]
Merge pull request #11727 from alalek:videoio_msmf_use_Lock2D

6 years agoMerge pull request #11715 from catree:add_tutorial_objDetect_HDR_java_python
Alexander Alekhin [Fri, 8 Jun 2018 18:59:29 +0000 (18:59 +0000)]
Merge pull request #11715 from catree:add_tutorial_objDetect_HDR_java_python

6 years agoMerge pull request #11702 from terfendail:msmf_sizefix
Alexander Alekhin [Fri, 8 Jun 2018 18:56:30 +0000 (18:56 +0000)]
Merge pull request #11702 from terfendail:msmf_sizefix

6 years agoAdd Java and Python code for cascade classifier and HDR tutorials.
catree [Thu, 7 Jun 2018 18:14:16 +0000 (20:14 +0200)]
Add Java and Python code for cascade classifier and HDR tutorials.

6 years agoFixed setting of frame size properties for MSMF-based VideoCapture
Vitaly Tuzov [Wed, 6 Jun 2018 13:00:55 +0000 (16:00 +0300)]
Fixed setting of frame size properties for MSMF-based VideoCapture

6 years agoffmpeg: update OpenCV FFmpeg wrapper (3.4)
Alexander Alekhin [Fri, 8 Jun 2018 15:47:00 +0000 (18:47 +0300)]
ffmpeg: update OpenCV FFmpeg wrapper (3.4)

6 years agovideoio(MSMF): refactor grabFrame() / retrieveFrame() methods
Alexander Alekhin [Fri, 8 Jun 2018 14:06:45 +0000 (17:06 +0300)]
videoio(MSMF): refactor grabFrame() / retrieveFrame() methods

- no behavior changes in grabFrame()
- added Lock2D() support into retrieveFrame()

6 years agoEnable SSD models from TensorFlow with OpenCL plugin of Intel's Inference Engine
Dmitry Kurtaev [Fri, 8 Jun 2018 13:55:21 +0000 (16:55 +0300)]
Enable SSD models from TensorFlow with OpenCL plugin of Intel's Inference Engine

6 years agoAdd LD_PRELOAD instruction to be able to run Java code that calls OpenCV functions...
catree [Fri, 8 Jun 2018 13:38:10 +0000 (15:38 +0200)]
Add LD_PRELOAD instruction to be able to run Java code that calls OpenCV functions that use the Intel MKL library.

6 years agoMerge pull request #11722 from gnthibault:3.4
Alexander Alekhin [Fri, 8 Jun 2018 12:59:19 +0000 (12:59 +0000)]
Merge pull request #11722 from gnthibault:3.4

6 years agosamples: add videocapture_camera sample
Alexander Alekhin [Fri, 8 Jun 2018 11:12:45 +0000 (14:12 +0300)]
samples: add videocapture_camera sample

- show capturing information: width / height / fps
- show average FPS for cap.read()+imshow() via cv::getTickCount()
- optional frame processing code path

6 years agoFixed Assertin error due to Size.area() overflowing
gnthibault [Fri, 8 Jun 2018 09:22:36 +0000 (11:22 +0200)]
Fixed Assertin error due to Size.area() overflowing

6 years agohighgui(win32): improve waitKey() timeout condition
Alexander Alekhin [Thu, 7 Jun 2018 16:25:01 +0000 (19:25 +0300)]
highgui(win32): improve waitKey() timeout condition

- use cv::getTickCount() instead of Win32 GetTickCount()
- process message queue before timeout exit

6 years agoMerge pull request #11649 from rockzhan:dnn_dw_prelu
rockzhan [Thu, 7 Jun 2018 13:45:54 +0000 (21:45 +0800)]
Merge pull request #11649 from rockzhan:dnn_dw_prelu

dnn: Fix output mismatch when forward dnn model contain [depthwise conv(group=1) + bn + prelu]  (#11649)

* this can make sure [depthwise conv(group=1) + bn + prelu] output not shift

* add TEST to show the output mismatch in [DWconv+Prelu]

* fix typo

* change loading image to init cvMat directly

* build runtime model, without loading external model

* remove whitespace

* change way to create a cvmat

* add bias_term, add target output

* fix [dwconv + prelu] value mismatch when no optimizations

* fix Test error when change output channels

* add parametric test

* change num_output to group value

* change conv code and change test back

6 years agoAdded ResizeBilinear op for tf (#11050)
David [Thu, 7 Jun 2018 13:29:04 +0000 (15:29 +0200)]
Added ResizeBilinear op for tf (#11050)

* Added ResizeBilinear op for tf

Combined ResizeNearestNeighbor and ResizeBilinear layers into Resize (with an interpolation param).

Minor changes to tf_importer and resize layer to save some code lines

Minor changes in init.cpp

Minor changes in tf_importer.cpp

* Replaced implementation of a custom ResizeBilinear layer to all layers

* Use Mat::ptr. Replace interpolation flags

6 years agoMerge pull request #11711 from alalek:python_standalone
Maksim Shabunin [Thu, 7 Jun 2018 13:27:19 +0000 (13:27 +0000)]
Merge pull request #11711 from alalek:python_standalone

6 years agopython: support standalone Python bindings build
Alexander Alekhin [Thu, 7 Jun 2018 09:32:48 +0000 (12:32 +0300)]
python: support standalone Python bindings build

- requires OpenCV source directory
- requires OpenCV binary directory with built modules and 'python_bindings_generator' target

6 years agoMerge pull request #11620 from terfendail:hmmorph_fix
Vadim Pisarevsky [Thu, 7 Jun 2018 11:19:21 +0000 (11:19 +0000)]
Merge pull request #11620 from terfendail:hmmorph_fix

6 years agocore:ppc Fix java CoreTest/testMahalanobis (#11677)
Sayed Adel [Thu, 7 Jun 2018 11:16:48 +0000 (14:16 +0300)]
core:ppc Fix java CoreTest/testMahalanobis (#11677)

* core:ppc Fix java CoreTest/testMahalanobis

* core:ppc Fix warning unused variable on clang

6 years agoMerge pull request #11705 from alalek:fix_samples_callback
Alexander Alekhin [Thu, 7 Jun 2018 11:14:52 +0000 (11:14 +0000)]
Merge pull request #11705 from alalek:fix_samples_callback

6 years agoMerge pull request #11704 from alalek:apps_avoid_catch_by_value
Alexander Alekhin [Thu, 7 Jun 2018 11:13:30 +0000 (11:13 +0000)]
Merge pull request #11704 from alalek:apps_avoid_catch_by_value

6 years agoMerge pull request #11700 from dkurt:dnn_ie_try_catch
Vadim Pisarevsky [Thu, 7 Jun 2018 11:09:00 +0000 (11:09 +0000)]
Merge pull request #11700 from dkurt:dnn_ie_try_catch

6 years agoWrap Inference Engine init to try-catch
Dmitry Kurtaev [Tue, 5 Jun 2018 14:18:14 +0000 (17:18 +0300)]
Wrap Inference Engine init to try-catch

6 years agoUpdate py_calibration.markdown
Kyle D. Patterson [Wed, 6 Jun 2018 20:26:11 +0000 (16:26 -0400)]
Update py_calibration.markdown

Improved readability by correcting grammar and idioms.

Further improved language and readability.

Attempted to fix list bullets.

Again, attempted to fix list bullets.

Removed trailing whitespace on line 8.

6 years agoFix for morphologyEx MORPH_HITMISS mode
Vitaly Tuzov [Tue, 29 May 2018 17:11:49 +0000 (20:11 +0300)]
Fix for morphologyEx MORPH_HITMISS mode

6 years agosamples: fix callback function type
Alexander Alekhin [Wed, 6 Jun 2018 15:29:05 +0000 (18:29 +0300)]
samples: fix callback function type

6 years agoapps: catch() with "const reference"
Alexander Alekhin [Wed, 6 Jun 2018 15:23:29 +0000 (18:23 +0300)]
apps: catch() with "const reference"

6 years agoMerge pull request #11683 from alalek:videoio_ffmpeg_cleanup_dead_code
Vadim Pisarevsky [Wed, 6 Jun 2018 12:20:59 +0000 (12:20 +0000)]
Merge pull request #11683 from alalek:videoio_ffmpeg_cleanup_dead_code

6 years agoMerge pull request #11650 from dkurt:dnn_default_backend
Vadim Pisarevsky [Wed, 6 Jun 2018 09:30:39 +0000 (09:30 +0000)]
Merge pull request #11650 from dkurt:dnn_default_backend

6 years agoMerge pull request #11695 from alalek:dnn_test_fix_sa_warnings
Alexander Alekhin [Tue, 5 Jun 2018 20:07:39 +0000 (20:07 +0000)]
Merge pull request #11695 from alalek:dnn_test_fix_sa_warnings

6 years agoMerge pull request #11692 from alalek:default_log_level_warnings
Alexander Alekhin [Tue, 5 Jun 2018 20:07:15 +0000 (20:07 +0000)]
Merge pull request #11692 from alalek:default_log_level_warnings

6 years agoMerge pull request #11687 from alalek:gstreamer_write_pipeline
Alexander Alekhin [Tue, 5 Jun 2018 20:06:55 +0000 (20:06 +0000)]
Merge pull request #11687 from alalek:gstreamer_write_pipeline

6 years agoMerge pull request #11685 from alalek:videoio_fix_backend_modes
Alexander Alekhin [Tue, 5 Jun 2018 20:06:27 +0000 (20:06 +0000)]
Merge pull request #11685 from alalek:videoio_fix_backend_modes

6 years agocore: set default logger level to 'warning' in Release builds
Alexander Alekhin [Tue, 5 Jun 2018 09:40:43 +0000 (12:40 +0300)]
core: set default logger level to 'warning' in Release builds

should hide unnecessary 'info' messages

6 years agoMerge pull request #11690 from peters:master
Alexander Alekhin [Tue, 5 Jun 2018 14:59:16 +0000 (14:59 +0000)]
Merge pull request #11690 from peters:master

6 years ago3rdparty: update libwebp 0.6.1 => 1.0.0
Peter Rekdal Sunde [Tue, 5 Jun 2018 08:37:40 +0000 (10:37 +0200)]
3rdparty: update libwebp 0.6.1 => 1.0.0

Commit: https://github.com/webmproject/libwebp/commit/698b8844e38a0c5ca50bb20f866e71291bfc3b36
Tag: https://github.com/webmproject/libwebp/releases/tag/v1.0.0

6 years agodnn(test): reuse test/test_common.hpp, eliminate dead code warning
Alexander Alekhin [Tue, 5 Jun 2018 09:48:35 +0000 (12:48 +0300)]
dnn(test): reuse test/test_common.hpp, eliminate dead code warning