Alexander Alekhin
8d1f254dcc
java: force using of 'Ptr<>' for OpenCV classes
...
backport of commit: e5841d3126
2021-07-02 21:20:08 +00:00
Alexander Alekhin
90df3af6cf
build: winpack_dldt with dldt 2021.4.0
2021-07-02 09:58:00 +00:00
Alexander Alekhin
b699fe7a9d
Merge pull request #20335 from SamFC10:concat-const-input
2021-07-01 10:25:35 +00:00
Alexander Alekhin
b2ed5c3070
Merge pull request #20333 from APrigarina:fix_samples_3.4
2021-07-01 09:41:56 +00:00
SamFC10
5b8c10f2f8
modified onnx importer to concat const input blobs
2021-07-01 10:58:31 +05:30
Alexander Alekhin
24983f62e2
Merge pull request #20325 from alalek:dnn_openvino_2021.4.0
2021-06-30 23:58:26 +00:00
Alexander Alekhin
f2057ce1ab
dnn(ie): replace deprecated calls
2021-06-30 22:30:15 +00:00
Alexander Alekhin
6797fd65a5
dnn(test): update tests for OpenVINO 2021.4
2021-06-30 22:30:15 +00:00
Alexander Alekhin
947e06a860
Merge pull request #20328 from alalek:backport_20321
2021-06-30 20:51:49 +00:00
Alexander Alekhin
04d5ba266f
Merge pull request #20330 from Wovchena:fix-arg-for-calcHist-in-demos
2021-06-30 14:59:22 +00:00
Vladimir
90be83ae99
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
2021-06-30 17:22:56 +03:00
APrigarina
5e80bd3cc9
fix samples 3.4
2021-06-30 12:50:21 +03:00
Alexander Alekhin
db4b1e613c
core(persistence): fix types format handling
...
partial backport of 4eac198270
2021-06-29 21:54:52 +00:00
Alexander Alekhin
7d842f5bcf
dnn: use OpenVINO 2021.4 defines
2021-06-29 18:48:21 +00:00
Alexander Alekhin
828304d587
Merge pull request #20128 from kikaxa:master
2021-06-21 21:52:17 +00:00
Alexander Alekhin
9d584475f6
Merge pull request #20283 from SamFC10:fix-batchnorm
2021-06-21 11:27:12 +00:00
kikaxa
bb60cb0bf9
Reenable filesystem for ios builds
2021-06-20 16:33:25 +00:00
SamFC10
55e1dfb778
Fix BatchNorm reinitialization
2021-06-20 13:19:29 +05:30
Alexander Alekhin
c2263db7bc
Merge pull request #20232 from gasparitiago:drawMatches3.4
2021-06-18 19:47:52 +00:00
Alexander Alekhin
7bbbda71df
Merge pull request #20253 from rogday:gtk_modifiers
2021-06-18 15:46:44 +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
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
Smirnov Egor
8f4f834ce6
applied modifier mask to the state
2021-06-10 10:57:15 +03: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
Alexander Alekhin
bd26104088
python(loader): add workaround to detect and patch sys.path[0]
2021-06-09 09:51:07 +00:00
Alexander Alekhin
5f80f43ff5
core: fix nSize initialization in cvIplImage()
2021-06-09 07:31:38 +00:00
Alexander Alekhin
b221143c0f
Merge pull request #20241 from alalek:fixup_20149
2021-06-08 13:44:58 +00:00
Alexander Alekhin
995841624c
highgui(gtk): fix NULL ptr checks
2021-06-08 10:57:24 +00:00
Alexander Alekhin
bbcd06f42f
Merge pull request #20236 from alalek:update_version_3.4.15-pre
2021-06-07 22:05:29 +00:00
Alexander Alekhin
43940f7ffc
pre: OpenCV 3.4.15 (version++)
2021-06-07 20:10:34 +00:00
jogo-
f4a79b0554
Merge pull request #20223 from jogo-:3.4_wp8_samples_typos
...
* Fix typo in App.xaml.cs
* Fix typo in App.xaml.cs
* Fix typo in App.xaml.cs
2021-06-07 17:32:14 +00:00
Tiago De Gaspari
411fd2b761
Add Thickness parameter in drawMatches function
...
This commit adds the feature of selecting the thickness
of the matches drawn by the drawMatches function.
In larger images, the default thickness of 1 pixel creates images
that are hard to visualize.
2021-06-07 12:52:48 -03:00
Alexander Alekhin
61e30c15a9
Merge pull request #20211 from kstuedem:fix_dshow_memory_leak
2021-06-05 16:02:12 +00:00
Alexander Alekhin
d332f33346
Merge pull request #20210 from kstuedem:fix_invalid_media_type
2021-06-05 16:01:51 +00:00
Kai Stüdemann
636db09d73
videoio(dshow) fix incompatible media type left set on video device
2021-06-04 10:45:39 +02:00
Kai Stüdemann
64c018507b
videoio(dshow) fix memory leak
2021-06-04 10:02:48 +02:00
Alexander Alekhin
c34445a496
Merge pull request #20201 from PolarNick239:3.4
2021-06-03 16:20:24 +00:00
Paul Jurczak
ff60abb575
Merge pull request #20080 from pauljurczak:patch-3
...
* Update dnn.hpp
getPerfProfile is not supported by the CUDA backend, see https://github.com/opencv/opencv/issues/20077
* dnn.hpp: fix doxygen formatting
2021-06-02 19:15:52 +00:00
Alexander Alekhin
7d91dfe339
Merge pull request #20146 from asmorkalov:as/java_test_filter
2021-06-02 17:50:29 +00:00
Alexander Alekhin
15af65d4cf
Merge pull request #20149 from rogday:on_mouse_floor
2021-06-02 17:48:43 +00:00
Alexander Alekhin
81afeda537
Merge pull request #20192 from alalek:update_libjpeg-turbo
2021-06-02 16:30:25 +00:00
Alexander Alekhin
e10de25e86
Merge pull request #20191 from alalek:issue_20032
2021-06-02 16:29:51 +00:00
Nikolay Polyarniy
746bd47ce5
EXR reading: support Z channel if no Y channel
2021-06-02 15:53:32 +03:00
Alexander Alekhin
dcb4cabb26
3rdparty: libjpeg-turbo 2.0.6 => 2.1.0
...
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.0
2021-06-01 20:01:19 +00:00
Alexander Alekhin
59b4baee0c
ts: migrate from cgi.escape to html.escape in .py file
2021-06-01 19:19:05 +00:00
Alexander Alekhin
bb3bbd192b
Merge pull request #20150 from rogday:svm_detector_test
2021-06-01 13:31:12 +00:00