Biswapriyo Nath
7e5d012f75
cmake: Enable pkgconfig support for mingw
2022-08-21 12:06:46 +05:30
Anatoliy Talamanov
925ff6241f
Merge pull request #22393 from TolyaTalamanov:at/fix-gapi-vpl-windows-build
...
* Fix G-API OneVPL compilation
* Fix macro
__WIN32__ -> _WIN32
2022-08-20 20:24:41 +03:00
Alexander Smorkalov
e14c3cff85
Merge pull request #22403 from Biswa96:add-locale-header
2022-08-19 10:01:23 +00:00
Biswapriyo Nath
984e42b0bc
videoio: Include missing locale header for std::wstring_convert
...
This fixes the following error with mingw toolchain:
opencv/modules/videoio/src/cap_msmf.cpp:1020: error: 'wstring_convert' is not a member of 'std'
1020 | std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> conv;
| ^~~~~~~~~~~~~~~
opencv/modules/videoio/src/cap_ffmpeg_hw.hpp:230:26: error: 'wstring_convert' is not a member of 'std'
230 | std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> conv;
| ^~~~~~~~~~~~~~~
The locale header is required according to C++ standard.
See https://en.cppreference.com/w/cpp/locale/wstring_convert
2022-08-19 13:15:58 +05:30
Alexander Smorkalov
0702685e7e
Merge pull request #22395 from hzcyf:infinite_loop_fix
2022-08-19 07:11:09 +00:00
Alexander Smorkalov
7deb8f568f
Merge pull request #22377 from Biswa96:condition_variable
2022-08-18 11:31:21 +00:00
Alexander Smorkalov
d8434e6875
Merge pull request #22396 from dmatveev:dm/ade-012
...
G-API: Bump ADE to version 0.1.2
2022-08-18 14:28:44 +03:00
Dmtiry Matveev
03130548ea
G-API: Bump ADE to version 0.1.2
2022-08-18 07:50:22 +03:00
hzcyf
11c5a6bb4d
Fix infinite loop in obsensor
2022-08-18 12:22:22 +08:00
Alexander Smorkalov
9fcf015214
Merge pull request #22376 from zihaomu:issue_22373
2022-08-15 10:00:11 +00:00
Alexander Smorkalov
ffccfa2ee9
Merge pull request #22325 from komakai:fix-quicklook
2022-08-15 09:25:43 +00:00
Zihao Mu
d3dcef4b8b
add new check for vidcap.h
2022-08-15 16:44:25 +08:00
Alexander Smorkalov
3cd36ebc7b
Merge pull request #22366 from lukasalexanderweber:4.x
2022-08-15 08:21:44 +00:00
Alexander Alekhin
2ebdc04787
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-08-14 15:50:42 +00:00
Alexander Alekhin
cc8add9f66
Merge pull request #22370 from catree:fix_22242_filter2d_float_double_doc
2022-08-14 15:04:12 +00:00
Biswapriyo Nath
c2c539e3cc
videoio: Include missing condition_variable header
...
This fixes the following error with mingw toolchain:
opencv/modules/videoio/src/cap_obsensor/obsensor_stream_channel_msmf.hpp:160:10: error: 'condition_variable' in namespace 'std' does not name a type
160 | std::condition_variable streamStateCv_;
| ^~~~~~~~~~~~~~~~~~
2022-08-14 19:26:08 +05:30
Alexander Alekhin
d0d115321d
Merge pull request #22350 from alalek:rework_psabi_warning
2022-08-13 15:05:41 +00:00
catree
3d8614cb47
Fix documentation about depth combinations for imgproc functions.
2022-08-12 12:53:01 +02:00
Alexander Smorkalov
d09cc0f30c
Merge pull request #22344 from ocpalo:libjpegturbo2.1.3
2022-08-12 10:26:26 +00:00
Lukas Weber
1bab920cf5
remove static con_thresh for adjuster
2022-08-11 18:04:28 +02:00
Alexander Smorkalov
bb71cb200e
Merge pull request #22199 from zihaomu:bug_fix_22195
...
DNN: Reduce Layer (add dynamic batch and ReduceSum support)
2022-08-11 12:59:51 +03:00
Alexander Smorkalov
48afe1586a
Merge pull request #22357 from jspricke:missing_header
2022-08-11 09:50:46 +00:00
Jochen Sprickerhof
496eed950f
Add missing header for LIBAVCODEC_VERSION_INT
2022-08-08 23:33:28 +02:00
Alexander Alekhin
75bb6aa9a1
build: disable psabi warning with GCC 7.0 and ARM
2022-08-07 15:46:44 +03:00
Alexander Alekhin
44b2f9637a
Revert "suppress warning on GCC 7 and later"
...
This reverts commit a630ad73cb
2022-08-07 15:43:10 +03:00
ocpalo
0643165519
update libjpeg-turbo version to 2.1.3
2022-08-05 23:38:57 +03:00
Alexander Smorkalov
cde18648dc
Merge pull request #22298 from rogday:tutorial_fix
2022-08-05 13:30:18 +00:00
rogday
04e01e2b31
Add new params
2022-08-05 15:08:16 +03:00
Alexander Smorkalov
348b7383f9
Merge pull request #22160 from sturkmen72:update_highgui
2022-08-05 11:39:53 +00:00
Alexander Smorkalov
b2b7193374
Merge pull request #22311 from zihaomu:layer_fused_optmized_mish
...
DNN: add another two Mish activation to onnx_graph_simplifier
2022-08-05 14:22:06 +03:00
Alexander Smorkalov
47a59d72c9
Merge pull request #22135 from rogday:force_reopen
2022-08-05 11:14:23 +00:00
Alexander Smorkalov
163770f99a
Merge pull request #22146 from rogday:symcircles
2022-08-05 11:13:14 +00:00
Alexander Smorkalov
4c1e064a2b
Merge pull request #22250 from ocpalo:codec_fix
2022-08-05 07:52:32 +00:00
Alexander Smorkalov
88555948d0
Merge pull request #22339 from asenyaev:asen/obsensor_fix_for_win
2022-08-05 06:59:45 +00:00
Alexander Smorkalov
1893b37e23
Merge pull request #22057 from mohawk2:typos
...
Typos: cheirality vs chirality
2022-08-03 16:27:46 +03:00
Alexander Smorkalov
c3cbd302cb
Merge pull request #22330 from zihaomu:skip_too_long_in_debug_test_dnn
2022-08-03 11:26:37 +00:00
Alexander Smorkalov
2ffa7ac0da
Merge pull request #22217 from CSharperMantle:CSharperMantle-patch-steady-clock
...
Use `std::chrono::steady_clock` in `getTickCount`
2022-08-03 14:09:45 +03:00
Alexander Smorkalov
885a446b10
Merge pull request #22212 from SergeyIvanov87:gapi_vpl_multiple_devices
...
G-API: VPL Add VAAPI into tests & VPL sample
2022-08-03 12:34:10 +03:00
Alexander Smorkalov
8bfe620fcc
Merge pull request #22313 from mateusztabaka:getline
2022-08-03 09:30:22 +00:00
Andrey Senyaev
129319b0bc
Fix in obsensor for VS 14
2022-08-03 12:14:15 +03:00
Alexander Smorkalov
50707a2741
Merge pull request #22223 from klatism:mobile-dynamically-linked-libs
2022-08-02 09:11:08 +00:00
Zihao Mu
0614c40b42
add more skip for very long test case in test_dnn.
2022-08-02 14:58:05 +08:00
Alexander Smorkalov
facd07a732
Merge pull request #22327 from hzcyf:4.x
2022-08-02 06:41:51 +00:00
Alexander Smorkalov
26ac81df3e
Merge pull request #22324 from gmbows:typo_fix
2022-08-02 06:36:34 +00:00
Alexander Smorkalov
1ec10ca565
Merge pull request #22309 from asenyaev:asen/ubuntu14.04_workflow
2022-08-02 06:33:01 +00:00
Alexander Smorkalov
26a39c733b
Merge pull request #22318 from asenyaev:asen/docs_4.x
2022-08-02 06:24:37 +00:00
Alexander Smorkalov
15f0e2e7cb
Merge pull request #22317 from asenyaev:asen/docs_3.4
2022-08-02 06:22:25 +00:00
Zihao Mu
d4640f4647
support ReduceLayer without reshape layer.
2022-08-02 10:32:31 +08:00
Andrey Senyaev
4c9364a803
Docs workflow in GHA for 3.4
2022-08-01 10:04:57 +03:00
hzcyf
e951edeed3
fix linkage issue when enable BUILD_opencv_world ( #22312 )
2022-08-01 14:38:22 +08:00
