Alexander Alekhin
9b7dca2fa1
Merge pull request #20281 from alalek:highgui_win32ui_plugin
2021-06-20 16:25:20 +00:00
Alexander Alekhin
735a79ae83
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-19 18:44:16 +00:00
Alexander Alekhin
ef2b400c61
highgui: win32ui plugin
2021-06-19 13:15:46 +00:00
Alexander Alekhin
c2263db7bc
Merge pull request #20232 from gasparitiago:drawMatches3.4
2021-06-18 19:47:52 +00:00
Anatoliy Talamanov
53eca2ff5b
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
2021-06-18 20:16:07 +03:00
Alexander Alekhin
7bbbda71df
Merge pull request #20253 from rogday:gtk_modifiers
2021-06-18 15:46:44 +00:00
Alexander Alekhin
f30f1afd47
Merge pull request #20272 from rogday:pollKey_link
2021-06-17 11:01:37 +00:00
Alexander Alekhin
b3db37b99d
Merge pull request #20238 from dmatveev:dm/gframe_docs
2021-06-16 15:06:04 +00:00
Smirnov Egor
7a276f39fb
reorder defined checks according to cmake file
2021-06-16 11:36:13 +03:00
Dmitry Matveev
415668ecf0
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
2021-06-16 01:01:55 +03:00
Maxim Pashchenkov
651967b95c
Merge pull request #19341 from mpashchenkov:mp/ocv-gapi-parsessd-fix
...
G-API: Removing ParseSSD overload.
* Removed specialization.
* Removed united
2021-06-15 19:02:17 +00:00
Alexander Alekhin
8e0baf257c
Merge pull request #20263 from vrabaud:3.4
2021-06-15 18:20:21 +00:00
Vincent Rabaud
c8268e65fd
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 ).
2021-06-15 14:58:11 +02:00
Tiago De Gaspari
3cf4375387
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 >
2021-06-12 23:28:54 +03:00
Alexander Alekhin
438e2dc228
Merge pull request #20260 from JoeHowse:DirectX-float16-conversions
2021-06-11 20:13:11 +00:00
Alexander Alekhin
c1adbe3189
Merge pull request #20190 from rogday:tf_importer_ref
2021-06-11 20:06:09 +00:00
rogday
7ee1816612
split if into map of functions
2021-06-11 13:20:45 +03:00
Joe Howse
b4084491e5
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
2021-06-11 00:55:06 -03:00
Alexander Alekhin
cb97421edf
Merge pull request #20257 from alalek:python_fix_extra_py_code_installation
2021-06-10 13:49:13 +00:00
Sergey Ivanov
e461031d40
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
2021-06-10 14:05:46 +03:00
Alexander Alekhin
c82e4596e4
cmake: fix installation of python extra code
2021-06-10 13:51:30 +03:00
Smirnov Egor
8f4f834ce6
applied modifier mask to the state
2021-06-10 10:57:15 +03:00
Alexander Alekhin
15ba3e123f
Merge pull request #20250 from alalek:highgui_fixes
2021-06-09 13:28:33 +00:00
Ian Maquignaz
2db243b8ed
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
2021-06-09 13:27:43 +00:00
Pinaev Danil
b57b64b7a3
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
2021-06-09 13:24:50 +00:00
Maxim Pashchenkov
8e386ac71f
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 >
2021-06-09 13:23:51 +00:00
Alexander Alekhin
bc1af6227a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-06-09 10:58:37 +00:00
Alexander Alekhin
2b84c97a78
Merge pull request #20251 from alalek:python_sys_path_0_workaround
2021-06-09 10:58:18 +00:00
Alexander Alekhin
3ddf84534b
Merge pull request #20248 from alalek:issue_20246
2021-06-09 10:52:16 +00:00
Dmitry Budnikov
4c2dff88de
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
2021-06-09 10:28:32 +00:00
Alexander Alekhin
bd26104088
python(loader): add workaround to detect and patch sys.path[0]
2021-06-09 09:51:07 +00:00
Alexander Alekhin
80238880e6
highgui(gtk): fix initialization order of global objects
2021-06-09 09:04:29 +00:00
Alexander Alekhin
f4abafb093
highgui: update error messages if no builtin backend
2021-06-09 08:39:50 +00:00
Alexander Alekhin
3e538355e2
highgui: force loading of imgcodecs module
...
- required for plugins on Linux (they use imwrite, but there is no link dependency)
2021-06-09 08:36:28 +00:00
Alexander Alekhin
5f80f43ff5
core: fix nSize initialization in cvIplImage()
2021-06-09 07:31:38 +00:00
Alexander Alekhin
76e9da3fe9
Merge pull request #20244 from alalek:update_ffmpeg_4.x
2021-06-08 19:23:25 +00:00
Alexander Alekhin
cafa04f842
Merge pull request #20221 from komakai:java-at-function
2021-06-08 18:45:38 +00:00
Alexander Alekhin
fef84f69ec
Merge pull request #20220 from komakai:swift-at-function
2021-06-08 18:45:20 +00:00
Alexander Alekhin
ba98cd97e5
videoio(test): skip AV1 HW tests
...
- FFMPEG: "[av1 @ 0000027ac07d1340] Your platform doesn't suppport hardware accelerated AV1 decoding."
2021-06-08 17:25:09 +00:00
Anna Prigarina
81b897c291
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
2021-06-08 15:46:57 +00:00
Alexander Alekhin
1c4d70896a
Merge pull request #20138 from YashasSamaga:cuda4dnn-runtime-matmul
2021-06-08 14:47:17 +00:00
Alexander Alekhin
039bcd932a
ffmpeg/4.x: update FFmpeg wrapper 2021.06
...
- FFmpeg 4.4
- libvpx 1.10.0
2021-06-08 14:18:24 +00:00
Alexander Alekhin
eaa9228a4f
Merge pull request #20242 from alalek:update_version_4.5.3-pre
2021-06-08 13:54:50 +00:00
Giles Payne
a8757df963
Make Kotlin plugin version compatible with the Gradle version
2021-06-08 22:51:07 +09:00
Alexander Alekhin
b221143c0f
Merge pull request #20241 from alalek:fixup_20149
2021-06-08 13:44:58 +00:00
Alexander Alekhin
2c796de92b
Merge pull request #20240 from alalek:fixup_20149_4.x
2021-06-08 13:44:24 +00:00
Vadim Pisarevsky
6f2a64a511
Merge pull request #20235 from IanMaquignaz:calib3d_update_hyperlinks
2021-06-08 13:27:12 +00:00
Alexander Alekhin
995841624c
highgui(gtk): fix NULL ptr checks
2021-06-08 10:57:24 +00:00
Alexander Alekhin
f5f675ef6c
highgui(gtk): fix NULL ptr checks
2021-06-08 10:55:51 +00:00
Anatoliy Talamanov
bdc8e9118b
Merge pull request #20169 from TolyaTalamanov:at/doc-generic-type
...
[G-API] Generic type documentation
* Put doc about generic type
* Fix comments to review
2021-06-08 11:59:57 +03:00