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

6 years agovideoio(gstreamer): support dumping of VideoWriter pipeline
Alexander Alekhin [Mon, 4 Jun 2018 18:38:24 +0000 (18:38 +0000)]
videoio(gstreamer): support dumping of VideoWriter pipeline

6 years agovideoio: fix capture modes
Alexander Alekhin [Mon, 4 Jun 2018 16:48:51 +0000 (19:48 +0300)]
videoio: fix capture modes

6 years agoMerge pull request #11682 from alalek:fix_pylint
Alexander Alekhin [Mon, 4 Jun 2018 16:16:08 +0000 (16:16 +0000)]
Merge pull request #11682 from alalek:fix_pylint

6 years agoMerge pull request #11681 from alalek:fix_docs_bs4_spaces
Alexander Alekhin [Mon, 4 Jun 2018 16:15:45 +0000 (16:15 +0000)]
Merge pull request #11681 from alalek:fix_docs_bs4_spaces

6 years agovideoio(ffmpeg): cleanup, remove dead code
Alexander Alekhin [Mon, 4 Jun 2018 16:05:45 +0000 (19:05 +0300)]
videoio(ffmpeg): cleanup, remove dead code

6 years agoMake Intel's Inference Engine backend is default if no preferable backend is specified.
Dmitry Kurtaev [Fri, 1 Jun 2018 07:54:12 +0000 (10:54 +0300)]
Make Intel's Inference Engine backend is default if no preferable backend is specified.

6 years agoMerge pull request #11646 from alalek:gtest_support_params_from_anonymous_namespace
Alexander Alekhin [Mon, 4 Jun 2018 15:27:33 +0000 (15:27 +0000)]
Merge pull request #11646 from alalek:gtest_support_params_from_anonymous_namespace

6 years agopython: eliminate pylint warnings
Alexander Alekhin [Mon, 4 Jun 2018 14:58:06 +0000 (17:58 +0300)]
python: eliminate pylint warnings

Tested with:
- pylint 1.9.1

6 years agoMerge pull request #11636 from alalek:cmake_ffmpeg_find_package
Alexander Alekhin [Mon, 4 Jun 2018 14:37:36 +0000 (14:37 +0000)]
Merge pull request #11636 from alalek:cmake_ffmpeg_find_package

6 years agodocs: preserve space symbols during bs4 processing
Alexander Alekhin [Mon, 4 Jun 2018 14:15:56 +0000 (17:15 +0300)]
docs: preserve space symbols during bs4 processing

6 years agoMerge pull request #11610 from savuor:fix/stereobm_simd_fixed_float
Rostislav Vasilikhin [Mon, 4 Jun 2018 13:03:12 +0000 (16:03 +0300)]
Merge pull request #11610 from savuor:fix/stereobm_simd_fixed_float

* StereoBM: fixed SIMD processing for fixed-type output arrays

* changed norm type and threshold, added assertion

* fixed disp_shift

6 years agogtest: support parameters with types from anonymous namespace
Alexander Alekhin [Thu, 31 May 2018 20:35:33 +0000 (20:35 +0000)]
gtest: support parameters with types from anonymous namespace

6 years agoMerge pull request #11654 from alalek:issue_11648
Vadim Pisarevsky [Mon, 4 Jun 2018 10:22:44 +0000 (10:22 +0000)]
Merge pull request #11654 from alalek:issue_11648

6 years agoMerge pull request #11644 from alalek:docs_avoid_master_links_in_3.4-2
Vadim Pisarevsky [Mon, 4 Jun 2018 10:19:44 +0000 (10:19 +0000)]
Merge pull request #11644 from alalek:docs_avoid_master_links_in_3.4-2

6 years agoMerge pull request #11670 from alalek:cmake_avoid_double_variable_expand
Vadim Pisarevsky [Mon, 4 Jun 2018 10:15:07 +0000 (10:15 +0000)]
Merge pull request #11670 from alalek:cmake_avoid_double_variable_expand

6 years agoMerge pull request #11671 from alalek:cmake_enable_pch_with_msvc_crosscompiling
Vadim Pisarevsky [Mon, 4 Jun 2018 10:13:59 +0000 (10:13 +0000)]
Merge pull request #11671 from alalek:cmake_enable_pch_with_msvc_crosscompiling

6 years agoMerge pull request #11657 from dkurt:dnn_ie_multiple_networks
Vadim Pisarevsky [Mon, 4 Jun 2018 10:12:46 +0000 (10:12 +0000)]
Merge pull request #11657 from dkurt:dnn_ie_multiple_networks

6 years agoMerge pull request #11678 from csukuangfj:fix-doc
Alexander Alekhin [Sun, 3 Jun 2018 11:00:38 +0000 (11:00 +0000)]
Merge pull request #11678 from csukuangfj:fix-doc

6 years agoMerge pull request #11674 from csukuangfj:fix-11673
Alexander Alekhin [Sun, 3 Jun 2018 11:00:10 +0000 (11:00 +0000)]
Merge pull request #11674 from csukuangfj:fix-11673

6 years agofix doc.
Kuang Fangjun [Sat, 2 Jun 2018 23:21:08 +0000 (07:21 +0800)]
fix doc.

6 years agofix #11673.
Kuang Fangjun [Sat, 2 Jun 2018 11:16:56 +0000 (19:16 +0800)]
fix #11673.

6 years agoMerge pull request #11647 from sanchom:3.4
Alexander Alekhin [Sat, 2 Jun 2018 20:52:17 +0000 (20:52 +0000)]
Merge pull request #11647 from sanchom:3.4

6 years agocmake: ENABLE_PRECOMPILED_HEADERS for MSVC cross-compiling
Alexander Alekhin [Sat, 2 Jun 2018 08:27:34 +0000 (08:27 +0000)]
cmake: ENABLE_PRECOMPILED_HEADERS for MSVC cross-compiling

MSVC ARM / WinRT builds

6 years agocmake: avoid double variable expand
Alexander Alekhin [Sat, 2 Jun 2018 08:16:31 +0000 (08:16 +0000)]
cmake: avoid double variable expand

6 years agoMerge pull request #11659 from take1014:snippet_11597
Alexander Alekhin [Fri, 1 Jun 2018 16:48:10 +0000 (16:48 +0000)]
Merge pull request #11659 from take1014:snippet_11597

6 years agoMerge pull request #11656 from pauljurczak:patch-1
Alexander Alekhin [Fri, 1 Jun 2018 16:39:54 +0000 (16:39 +0000)]
Merge pull request #11656 from pauljurczak:patch-1

6 years agoMerge pull request #11641 from alalek:videoio_test_fixup
Alexander Alekhin [Fri, 1 Jun 2018 16:39:11 +0000 (16:39 +0000)]
Merge pull request #11641 from alalek:videoio_test_fixup

6 years agoadd imgproc snippets
take1014 [Fri, 1 Jun 2018 14:42:00 +0000 (23:42 +0900)]
add imgproc snippets

6 years agoMerge pull request #11651 from vladkraievskiy:master
Alexander Alekhin [Fri, 1 Jun 2018 11:28:15 +0000 (11:28 +0000)]
Merge pull request #11651 from vladkraievskiy:master

6 years agoFix multiple networks with Intel's Inference Engine backend
Dmitry Kurtaev [Fri, 1 Jun 2018 11:10:32 +0000 (14:10 +0300)]
Fix multiple networks with Intel's Inference Engine backend

6 years agoconvertFp16 documentation edit (2)
Paul Jurczak [Fri, 1 Jun 2018 10:15:21 +0000 (04:15 -0600)]
convertFp16 documentation edit (2)

If this seems too wordy, take into account a new user who tries to find out extent of FP16 support in OpenCV.

6 years agoFixed a typo in android toolchain documentation.
Vlad Kraevskiy [Fri, 1 Jun 2018 08:38:47 +0000 (11:38 +0300)]
Fixed a typo in android toolchain documentation.

6 years agocore: drop unnecessary duplicate check
Alexander Alekhin [Fri, 1 Jun 2018 09:31:48 +0000 (12:31 +0300)]
core: drop unnecessary duplicate check

6 years agoRefactored out a dead code path.
Sancho McCann [Thu, 31 May 2018 21:09:26 +0000 (21:09 +0000)]
Refactored out a dead code path.

6 years agoMerge pull request #11642 from alalek:calib3d_chess_board_avoid_clone
Alexander Alekhin [Thu, 31 May 2018 19:17:48 +0000 (19:17 +0000)]
Merge pull request #11642 from alalek:calib3d_chess_board_avoid_clone

6 years agoHsv2rgb univ intrin (#11637)
Vadim Pisarevsky [Thu, 31 May 2018 18:59:45 +0000 (21:59 +0300)]
Hsv2rgb univ intrin (#11637)

* add universal intrinsics for HSV2RGB_b

* rewritten HSV2RGB_b without using extra universal intrinsics

* removed unused variable

* undo changes in v_load_deinterleave

6 years agoMerge pull request #11608 from take1014:hist_11544
Alexander Alekhin [Thu, 31 May 2018 16:44:02 +0000 (16:44 +0000)]
Merge pull request #11608 from take1014:hist_11544

6 years agoMerge pull request #11634 from vpisarev:empty_mat_with_types_2
Vadim Pisarevsky [Thu, 31 May 2018 16:36:39 +0000 (19:36 +0300)]
Merge pull request #11634 from vpisarev:empty_mat_with_types_2

fixes handling of empty matrices in some functions (#11634)

* a part of PR #11416 by Yuki Takehara

* moved the empty mat check in Mat::copyTo()

* fixed some test failures

6 years agoMerge pull request #11639 from alalek:fix_precomp_hpp
Alexander Alekhin [Thu, 31 May 2018 16:35:21 +0000 (16:35 +0000)]
Merge pull request #11639 from alalek:fix_precomp_hpp

6 years agocalib3d: cv::findContours() doesn't require to clone input
Alexander Alekhin [Thu, 31 May 2018 16:08:00 +0000 (19:08 +0300)]
calib3d: cv::findContours() doesn't require to clone input

6 years agodocumentation: avoid links to 'master' branch from 3.4 maintenance branch (2)
Alexander Alekhin [Thu, 31 May 2018 16:30:56 +0000 (19:30 +0300)]
documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)

Other links:
- https://raw.githubusercontent.com/opencv/opencv/master
- https://github.com/opencv/opencv/blob/master

6 years agoMerge pull request #11638 from alalek:docs_avoid_master_links_in_3.4
Alexander Alekhin [Thu, 31 May 2018 16:22:03 +0000 (16:22 +0000)]
Merge pull request #11638 from alalek:docs_avoid_master_links_in_3.4

6 years agovideoio(test): fixup information dump
Alexander Alekhin [Thu, 31 May 2018 15:54:43 +0000 (18:54 +0300)]
videoio(test): fixup information dump

6 years agocmake: support find_package(FFMPEG)
Alexander Alekhin [Thu, 31 May 2018 12:39:59 +0000 (15:39 +0300)]
cmake: support find_package(FFMPEG)

Use "OPENCV_FFMPEG_USE_FIND_PACKAGE" variable to specify find_package() parameters

6 years agoMerge pull request #11633 from alalek:issue_10546
Alexander Alekhin [Thu, 31 May 2018 15:08:45 +0000 (15:08 +0000)]
Merge pull request #11633 from alalek:issue_10546

6 years agoMerge pull request #11635 from dkurt:dnn_fix_ie_fused_layer_output
Vadim Pisarevsky [Thu, 31 May 2018 14:52:57 +0000 (14:52 +0000)]
Merge pull request #11635 from dkurt:dnn_fix_ie_fused_layer_output

6 years agoCorrect handling when IPP is enabled
take1014 [Thu, 31 May 2018 13:54:32 +0000 (22:54 +0900)]
Correct handling when IPP is enabled

6 years agofix missing precomp.hpp
Alexander Alekhin [Thu, 31 May 2018 13:53:44 +0000 (16:53 +0300)]
fix missing precomp.hpp

6 years agodocumentation: avoid links to 'master' branch from 3.4 maintenance branch
Alexander Alekhin [Thu, 31 May 2018 13:45:18 +0000 (16:45 +0300)]
documentation: avoid links to 'master' branch from 3.4 maintenance branch