Alexander Alekhin [Thu, 1 Jul 2021 10:52:31 +0000 (10:52 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Maxim Pashchenkov [Thu, 1 Jul 2021 10:27:28 +0000 (13:27 +0300)]
Merge pull request #20144 from mpashchenkov:mp/python-ge
G-API: Python. Gaze Estimation sample.
* GE pep8
* Added function description, wrapped copy
* Applying review comments
* One more change
* Added gin
* Rstrt bb
Alexander Alekhin [Thu, 1 Jul 2021 10:25:35 +0000 (10:25 +0000)]
Merge pull request #20335 from SamFC10:concat-const-input
Alexander Alekhin [Thu, 1 Jul 2021 09:52:19 +0000 (09:52 +0000)]
Merge pull request #20336 from JoeHowse:refactor-cl_image-float16-conversions
Alexander Alekhin [Thu, 1 Jul 2021 09:41:56 +0000 (09:41 +0000)]
Merge pull request #20333 from APrigarina:fix_samples_3.4
Anatoliy Talamanov [Thu, 1 Jul 2021 09:36:19 +0000 (12:36 +0300)]
Merge pull request #20284 from TolyaTalamanov:at/wrap-render
G-API: Wrap render functionality to python
* Wrap render Rect prim
* Add all primitives and tests
* Cover mosaic and image
* Handle error in pyopencv_to(Prim)
* Move Mosaic and Rect ctors wrappers to shadow file
* Use GAPI_PROP_RW
* Fix indent
SamFC10 [Wed, 30 Jun 2021 16:25:42 +0000 (21:55 +0530)]
modified onnx importer to concat const input blobs
Alexander Alekhin [Wed, 30 Jun 2021 23:58:26 +0000 (23:58 +0000)]
Merge pull request #20325 from alalek:dnn_openvino_2021.4.0
Alexander Alekhin [Tue, 29 Jun 2021 21:55:18 +0000 (21:55 +0000)]
dnn(ie): replace deprecated calls
Alexander Alekhin [Tue, 29 Jun 2021 20:25:22 +0000 (20:25 +0000)]
dnn(test): update tests for OpenVINO 2021.4
Rafael H Tibães [Wed, 30 Jun 2021 22:08:24 +0000 (19:08 -0300)]
Merge pull request #20327 from tibaes:MSMF-Slow-Webcam-Startup
* fixes MSMF slow webcam startup
* add variable to change MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS at runtime
Alexander Alekhin [Wed, 30 Jun 2021 20:51:49 +0000 (20:51 +0000)]
Merge pull request #20328 from alalek:backport_20321
Joe Howse [Mon, 21 Jun 2021 03:46:32 +0000 (00:46 -0300)]
OpenCL: core support for FP16, more channel orders
* Support cl_image conversion for CL_HALF_FLOAT (float16)
* Support cl_image conversion for additional channel orders:
CL_A, CL_INTENSITY, CL_LUMINANCE, CL_RG, CL_RA
* Comment on why cl_image conversion is unsupported for CL_RGB
* Predict optimal vector width for float16
* ocl::kernelToStr: support float16
* ocl::Device::halfFPConfig: drop artificial requirement for OpenCL
version >= 1.2. Even OpenCL 1.0 supports the underlying config
property, CL_DEVICE_HALF_FP_CONFIG.
* dumpOpenCLInformation: provide info on OpenCL half-float support
and preferred half-float vector width
* randu: support default range [-1.0, 1.0] for float16
* TestBase::warmup: support float16
Alexander Alekhin [Wed, 30 Jun 2021 14:59:22 +0000 (14:59 +0000)]
Merge pull request #20330 from Wovchena:fix-arg-for-calcHist-in-demos
Vladimir [Wed, 30 Jun 2021 07:15:58 +0000 (10:15 +0300)]
Fix an arg for calcHist() in demos
`float* histRange = { range };` doesn't make much sense. `histRange` is
an array of array(s), so it should have a type of ptr to ptr. Strangely
some domos are correct as well as the example for the function
https://docs.opencv.org/master/d6/dc7/group__imgproc__hist.html#ga4b2b5fd75503ff9e6844cc4dcdaed35d
APrigarina [Wed, 30 Jun 2021 09:50:21 +0000 (12:50 +0300)]
fix samples 3.4
Anatoliy Talamanov [Wed, 30 Jun 2021 09:04:09 +0000 (12:04 +0300)]
Merge pull request #20271 from TolyaTalamanov:at/extend-python-bindings
G-API: Extend python bindings
* Extend G-API bindings
* Wrap timestamp, seqNo, seq_id
* Wrap copy
* Wrap parseSSD, parseYolo
* Rewrap cv.gapi.networks
* Add test for metabackend in pytnon
* Remove int64 pyopencv_to
Alexander Alekhin [Tue, 29 Jun 2021 09:00:10 +0000 (09:00 +0000)]
core(persistence): fix types format handling
partial backport of
4eac198270783d8924ed26ecfb82f8aa54d9e67d
Alexander Alekhin [Tue, 29 Jun 2021 21:13:19 +0000 (21:13 +0000)]
Merge pull request #20321 from alalek:issue_20279
Alexander Alekhin [Tue, 29 Jun 2021 18:48:21 +0000 (18:48 +0000)]
dnn: use OpenVINO 2021.4 defines
Alexander Alekhin [Tue, 29 Jun 2021 09:00:10 +0000 (09:00 +0000)]
core(persistence): fix types format handling, fix 16F support
Alexander Alekhin [Mon, 28 Jun 2021 20:54:44 +0000 (20:54 +0000)]
Merge pull request #20302 from rogday:tf_import_diag
Alexander Alekhin [Mon, 28 Jun 2021 20:52:32 +0000 (20:52 +0000)]
Merge pull request #20318 from komakai:better-unsigned-type-support
Giles Payne [Sun, 27 Jun 2021 12:08:25 +0000 (21:08 +0900)]
Improvements/fixes for unsigned type handling in Swift/Kotlin
xzvno [Sat, 26 Jun 2021 21:01:31 +0000 (05:01 +0800)]
Merge pull request #20293 from endjkv:fix-mem-leak-when-throw
* fix memory leak when exception is thrown
Alexey Smirnov [Fri, 25 Jun 2021 21:09:33 +0000 (00:09 +0300)]
Merge pull request #20156 from smirnov-alexey:as/gapi_remote_infer
G-API: Support remote inference
* Extend MediaFrame to be able to extract additional info besides access
* Add API for remote inference
* Add default implementation for blobParams()
* Add default implementation for blobParams()
* Address review comments
* Fix any_cast usage
* Add comment on the default blobParams()
* Address review comments
* Add missing rctx
* Minor fix
* Fix indentation and comment
* Address review comments
* Add documentation
Smirnov Egor [Mon, 21 Jun 2021 08:11:14 +0000 (11:11 +0300)]
skipping missing layers and layer failures
Alexander Alekhin [Thu, 24 Jun 2021 09:51:36 +0000 (09:51 +0000)]
Merge pull request #20304 from vrabaud:master
Vincent Rabaud [Wed, 23 Jun 2021 19:27:54 +0000 (21:27 +0200)]
Do not use = 0 for a cv::Mat.
There are several operator= overloads and some compilers can be confused.
Alexander Alekhin [Wed, 23 Jun 2021 18:15:14 +0000 (18:15 +0000)]
Merge pull request #20295 from diablodale:umat_factory_usageflags
Dale Phurrough [Tue, 22 Jun 2021 03:32:54 +0000 (05:32 +0200)]
add usageFlags to UMat static factories
- add abi compatible overloads
- add test case
Alexander Alekhin [Tue, 22 Jun 2021 22:58:51 +0000 (22:58 +0000)]
Merge pull request #20204 from Developer-Ecosystem-Engineering:improve-sift
Alexander Alekhin [Mon, 21 Jun 2021 21:52:17 +0000 (21:52 +0000)]
Merge pull request #20128 from kikaxa:master
Alexander Alekhin [Mon, 21 Jun 2021 11:27:12 +0000 (11:27 +0000)]
Merge pull request #20283 from SamFC10:fix-batchnorm
kikaxa [Thu, 20 May 2021 13:01:36 +0000 (16:01 +0300)]
Reenable filesystem for ios builds
Alexander Alekhin [Sun, 20 Jun 2021 16:27:47 +0000 (16:27 +0000)]
Merge pull request #20259 from IanMaquignaz:inverseRectification_newUnitTest
Alexander Alekhin [Sun, 20 Jun 2021 16:25:20 +0000 (16:25 +0000)]
Merge pull request #20281 from alalek:highgui_win32ui_plugin
SamFC10 [Sun, 20 Jun 2021 07:49:29 +0000 (13:19 +0530)]
Fix BatchNorm reinitialization
Alexander Alekhin [Sat, 19 Jun 2021 18:36:27 +0000 (18:36 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 19 Jun 2021 09:16:23 +0000 (09:16 +0000)]
highgui: win32ui plugin
Alexander Alekhin [Fri, 18 Jun 2021 19:47:52 +0000 (19:47 +0000)]
Merge pull request #20232 from gasparitiago:drawMatches3.4
Anatoliy Talamanov [Fri, 18 Jun 2021 17:16:07 +0000 (20:16 +0300)]
Merge pull request #20196 from TolyaTalamanov:at/support-vaargs-compile-args
G-API: Support vaargs for cv.compile_args
* Support cv.compile_args to work with variadic number of inputs
* Disable python2.x G-API
* Move compile_args to gapi pkg
Alexander Alekhin [Fri, 18 Jun 2021 15:46:43 +0000 (15:46 +0000)]
Merge pull request #20253 from rogday:gtk_modifiers
Developer-Ecosystem-Engineering [Thu, 17 Jun 2021 17:14:48 +0000 (10:14 -0700)]
Improve SIFT for arm64/Apple silicon
- Reduce branch density by collapsing compares.
- Fix windows build errors
- Use OpenCV universal intrinsics
- Use v_check_any and v_signmask as requested
Ian Maquignaz [Fri, 11 Jun 2021 00:13:06 +0000 (20:13 -0400)]
Added new unit test for initInverseRectificationMap()
Function is validated. Included an update to DISABLED_Calib3d_InitInverseRectificationMap.
Includes updates per input from @alalek and unit test regression # to reflect PR #
Alexander Alekhin [Thu, 17 Jun 2021 11:01:37 +0000 (11:01 +0000)]
Merge pull request #20272 from rogday:pollKey_link
Alexander Alekhin [Wed, 16 Jun 2021 15:06:04 +0000 (15:06 +0000)]
Merge pull request #20238 from dmatveev:dm/gframe_docs
Smirnov Egor [Wed, 16 Jun 2021 08:36:13 +0000 (11:36 +0300)]
reorder defined checks according to cmake file
Dmitry Matveev [Mon, 31 May 2021 19:02:05 +0000 (22:02 +0300)]
G-API: Documentation updates
1) Document GFrame/MediaFrame (and also other G-API types)
- Added doxygen comments for GMat, GScalar, GArray<T>, GOpaque classes;
- Documented GFrame and its host-side counterpart MediaFrame;
- Added some more notes to the data type classes.
2) Give @brief descriptions to most of the cv::gapi::* namespaces
3) Make some symbols private
- These structures are mainly internal and shouldn't be used directly
Maxim Pashchenkov [Tue, 15 Jun 2021 19:02:17 +0000 (22:02 +0300)]
Merge pull request #19341 from mpashchenkov:mp/ocv-gapi-parsessd-fix
G-API: Removing ParseSSD overload.
* Removed specialization.
* Removed united
Alexander Alekhin [Tue, 15 Jun 2021 18:20:21 +0000 (18:20 +0000)]
Merge pull request #20263 from vrabaud:3.4
Vincent Rabaud [Fri, 11 Jun 2021 20:03:33 +0000 (22:03 +0200)]
Fix potential NaN in cv::norm.
There can be an int overflow.
cv::norm( InputArray _src, int normType, InputArray _mask ) is fine,
not cv::norm( InputArray _src1, InputArray _src2, int normType, InputArray _mask ).
Tiago De Gaspari [Sat, 12 Jun 2021 20:28:54 +0000 (17:28 -0300)]
Merge pull request #19842 from gasparitiago:3.4
Update rotatedRectangleIntersection function to calculate near to origin
* Change type used in points function from RotatedRect
In the function that sets the points of a RotatedRect, the types
should be double in order to keep the precision when dealing with
RotatedRects that are defined far from the origin.
This commit solves the problem in some assertions from
rotatedRectangleIntersection when dealing with rectangles far from
origin.
* added proper type casts
* Update rotatedRectangleIntersection function to calculate near to origin
This commit changes the rotatedRectangleIntersection function in order
to calculate the intersection of two rectangles considering that they
are shifted near the coordinates origin (0, 0).
This commit solves the problem in some assertions from
rotatedRectangleIntersection when dealing with rectangles far from
origin.
* Revert type changes in types.cpp and adequate code to c++98
* Revert unnecessary casts on types.cpp
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Alexander Alekhin [Fri, 11 Jun 2021 20:13:11 +0000 (20:13 +0000)]
Merge pull request #20260 from JoeHowse:DirectX-float16-conversions
Alexander Alekhin [Fri, 11 Jun 2021 20:06:09 +0000 (20:06 +0000)]
Merge pull request #20190 from rogday:tf_importer_ref
rogday [Tue, 1 Jun 2021 14:05:27 +0000 (17:05 +0300)]
split if into map of functions
Joe Howse [Fri, 11 Jun 2021 02:56:55 +0000 (23:56 -0300)]
DirectX: Support more types, including float16
Support the following type conversions:
* CV_16FC4 --> DXGI_FORMAT_R16G16B16A16_FLOAT
* CV_16FC2 --> DXGI_FORMAT_R16G16_FLOAT
* CV_16FC1 --> DXGI_FORMAT_R16_FLOAT
* CV_32FC2 --> DXGI_FORMAT_R32G32_FLOAT
* CV_32FC1 --> DXGI_FORMAT_D32_FLOAT
* CV_32SC2 --> DXGI_FORMAT_R32G32_UINT
* CV_32SC2 --> DXGI_FORMAT_R32G32_SINT
* CV_8UC4 --> DXGI_FORMAT_R8G8_B8G8_UNORM
* CV_8UC4 --> DXGI_FORMAT_G8R8_G8B8_UNORM
Alexander Alekhin [Thu, 10 Jun 2021 13:49:13 +0000 (13:49 +0000)]
Merge pull request #20257 from alalek:python_fix_extra_py_code_installation
Sergey Ivanov [Thu, 10 Jun 2021 11:05:46 +0000 (14:05 +0300)]
Merge pull request #20184 from sivanov-work:fix_gapi_empty_input
G-API: Add standalone fix for graph empty input
* Add sandalone fix for graph empty input
* Apply some review comments
* Fix whitespace
* Apply review comment: make Mat check more deeper
* Apply some comments
* Remove tracer apply exception throwing
* Apply comments: move validatio into gproto_priv.hpp
* Apply minor text correction
* Fix alignment, remove try-catch
Alexander Alekhin [Thu, 10 Jun 2021 10:51:30 +0000 (13:51 +0300)]
cmake: fix installation of python extra code
Smirnov Egor [Wed, 9 Jun 2021 15:43:42 +0000 (18:43 +0300)]
applied modifier mask to the state
Alexander Alekhin [Wed, 9 Jun 2021 13:28:33 +0000 (13:28 +0000)]
Merge pull request #20250 from alalek:highgui_fixes
Ian Maquignaz [Wed, 9 Jun 2021 13:27:43 +0000 (09:27 -0400)]
Merge pull request #20247 from IanMaquignaz:inverseRectification_update
Update to initInverseRectificationMap()
* update to initInverseRectificationMap() documentation
* Restructured Calib3d_InitInverseRectificationMap unit test per feedback from alalek
* whitespace
Pinaev Danil [Wed, 9 Jun 2021 13:24:50 +0000 (16:24 +0300)]
Merge pull request #20129 from aDanPin:dp/improvement_gapi_stereo_documentation
G-API: Improvement stereo documentation.
* Documentation improvement
* Set valid default values for gapi stereo
* Small doc fix
* Review response
* Review response
* Review response
* Review response
* Revie response
* Review response
* Review response
* Review response
Maxim Pashchenkov [Wed, 9 Jun 2021 13:23:51 +0000 (16:23 +0300)]
Merge pull request #20112 from mpashchenkov:mp/ocv-gapi-docs-part1
G-API: Documentation for Params (IE and ONNX).
* Applying comments
* Removed type of model from PramsDesc
* Added message for onnx ParamDesc
* Whitespaces
* Review
* Fix comments to review
* Fix comments
Co-authored-by: Anatoliy Talamanov <anatoliy.talamanov@intel.com>
Alexander Alekhin [Wed, 9 Jun 2021 10:58:37 +0000 (10:58 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 9 Jun 2021 10:58:18 +0000 (10:58 +0000)]
Merge pull request #20251 from alalek:python_sys_path_0_workaround
Alexander Alekhin [Wed, 9 Jun 2021 10:52:16 +0000 (10:52 +0000)]
Merge pull request #20248 from alalek:issue_20246
Dmitry Budnikov [Wed, 9 Jun 2021 10:28:32 +0000 (13:28 +0300)]
Merge pull request #20245 from dbudniko:dbudniko/mtcnn_roi_size_hotfix
Hot fix negative MTCNN PNet ROI coordinates
* fix negative roi start
* some more experiments
* clean up
Alexander Alekhin [Wed, 9 Jun 2021 09:51:07 +0000 (09:51 +0000)]
python(loader): add workaround to detect and patch sys.path[0]
Alexander Alekhin [Wed, 9 Jun 2021 09:04:29 +0000 (09:04 +0000)]
highgui(gtk): fix initialization order of global objects
Alexander Alekhin [Wed, 9 Jun 2021 08:36:32 +0000 (08:36 +0000)]
highgui: update error messages if no builtin backend
Alexander Alekhin [Wed, 9 Jun 2021 08:34:58 +0000 (08:34 +0000)]
highgui: force loading of imgcodecs module
- required for plugins on Linux (they use imwrite, but there is no link dependency)
Alexander Alekhin [Wed, 9 Jun 2021 07:31:38 +0000 (07:31 +0000)]
core: fix nSize initialization in cvIplImage()
Alexander Alekhin [Tue, 8 Jun 2021 19:23:25 +0000 (19:23 +0000)]
Merge pull request #20244 from alalek:update_ffmpeg_4.x
Alexander Alekhin [Tue, 8 Jun 2021 18:45:38 +0000 (18:45 +0000)]
Merge pull request #20221 from komakai:java-at-function
Alexander Alekhin [Tue, 8 Jun 2021 18:45:20 +0000 (18:45 +0000)]
Merge pull request #20220 from komakai:swift-at-function
Alexander Alekhin [Tue, 8 Jun 2021 17:25:09 +0000 (17:25 +0000)]
videoio(test): skip AV1 HW tests
- FFMPEG: "[av1 @
0000027ac07d1340] Your platform doesn't suppport hardware accelerated AV1 decoding."
Anna Prigarina [Tue, 8 Jun 2021 15:46:57 +0000 (18:46 +0300)]
Merge pull request #20243 from APrigarina:fix_tracking_api
Tracking API: fix incorrect structure
* fix incorrect structure of best score id
* video(DaSiamRPN): specify sizes of scalar arrays
Alexander Alekhin [Tue, 8 Jun 2021 14:47:17 +0000 (14:47 +0000)]
Merge pull request #20138 from YashasSamaga:cuda4dnn-runtime-matmul
Alexander Alekhin [Tue, 8 Jun 2021 14:18:24 +0000 (14:18 +0000)]
ffmpeg/4.x: update FFmpeg wrapper 2021.06
- FFmpeg 4.4
- libvpx 1.10.0
Alexander Alekhin [Tue, 8 Jun 2021 13:54:50 +0000 (13:54 +0000)]
Merge pull request #20242 from alalek:update_version_4.5.3-pre
Giles Payne [Tue, 8 Jun 2021 13:51:07 +0000 (22:51 +0900)]
Make Kotlin plugin version compatible with the Gradle version
Alexander Alekhin [Tue, 8 Jun 2021 13:44:58 +0000 (13:44 +0000)]
Merge pull request #20241 from alalek:fixup_20149
Alexander Alekhin [Tue, 8 Jun 2021 13:44:24 +0000 (13:44 +0000)]
Merge pull request #20240 from alalek:fixup_20149_4.x
Vadim Pisarevsky [Tue, 8 Jun 2021 13:27:12 +0000 (13:27 +0000)]
Merge pull request #20235 from IanMaquignaz:calib3d_update_hyperlinks
Alexander Alekhin [Tue, 8 Jun 2021 08:39:06 +0000 (08:39 +0000)]
highgui(gtk): fix NULL ptr checks
Alexander Alekhin [Tue, 8 Jun 2021 08:39:06 +0000 (08:39 +0000)]
highgui(gtk): fix NULL ptr checks
Anatoliy Talamanov [Tue, 8 Jun 2021 08:59:57 +0000 (11:59 +0300)]
Merge pull request #20169 from TolyaTalamanov:at/doc-generic-type
[G-API] Generic type documentation
* Put doc about generic type
* Fix comments to review
Alexey Smirnov [Tue, 8 Jun 2021 08:58:51 +0000 (11:58 +0300)]
Merge pull request #20151 from smirnov-alexey:as/extend_media_frame
G-API: Extend MediaFrame to be able to extract additional info besides access
* Extend MediaFrame to be able to extract additional info besides access
* Add default implementation for blobParams()
* Add comment on the default blobParams()
Alexander Alekhin [Mon, 17 May 2021 10:43:38 +0000 (10:43 +0000)]
pre: OpenCV 4.5.3 (version++)
Alexander Alekhin [Tue, 8 Jun 2021 05:04:57 +0000 (05:04 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Vadim Pisarevsky [Tue, 8 Jun 2021 01:44:56 +0000 (01:44 +0000)]
Merge pull request #20165 from IanMaquignaz:inverseRectification
Alexander Alekhin [Mon, 7 Jun 2021 22:05:29 +0000 (22:05 +0000)]
Merge pull request #20236 from alalek:update_version_3.4.15-pre
JoeHowse [Mon, 7 Jun 2021 20:24:27 +0000 (17:24 -0300)]
Merge pull request #20203 from JoeHowse:clMath-patches
Fix dynamic loading of clBLAS and clFFT (formerly, clAmdBlas and clAmdFft)
* Fix dynamic loading of clBLAS and clFFT
* Update filenames and function names for clBLAS (formerly, clAmdBlas)
* Update filenames and function names for clFFT (formerly, clAmdFft)
* Uncomment teardown of clFFT; tear down clFFT in same way as clBLAS
* Fix generators for clBLAS and clFFT headers
* Update generators to parse recent clBLAS and clFFT library headers
* Update generators to be compatible with Python 3
* Re-generate OpenCV's clBLAS and clFFT headers
* Update function calls to match names in newly generated headers
* Disable (and comment on) teardown code for clBLAS and clFFT
* Renaming *clamd* files
* Renaming *clamdblas* files to *clblas*
* Renaming *clamdfft* files to *clfft*
* Update generator for CL headers
* Update generator to be compatible with Python 3
Alexander Alekhin [Mon, 7 Jun 2021 20:20:13 +0000 (20:20 +0000)]
Merge pull request #20027 from diablodale:fix19807-UMat-usageFlags
Alexander Alekhin [Mon, 7 Jun 2021 20:10:34 +0000 (20:10 +0000)]
pre: OpenCV 3.4.15 (version++)
Ian Maquignaz [Fri, 28 May 2021 20:47:36 +0000 (16:47 -0400)]
Added declaration, definition and unit test for initInverseRectificationMap()
Fixed trailing whitespace
Update to initInverseRectificationMap documentation for clarity
Added test case for initInverseRectificationMap()
Updated documentation.
Fixed whitespace error in docs
Small update to test function
Now passes success_error_level
final update to inverseRectification documentation
Ian Maquignaz [Mon, 7 Jun 2021 15:30:58 +0000 (11:30 -0400)]
Added markup to enable hyperlinking of functions in calib3d documentation
fixed find*, calibrate*, stereo*
fixed decompose*, convert*
Fixed recoverPose, and projectPoints
Fixed typo in docs which resulted in a docs warning
Alexander Alekhin [Mon, 7 Jun 2021 17:36:44 +0000 (17:36 +0000)]
Merge pull request #20229 from alalek:fix_highgui_build