Xinguang Bian
5627a0cbdf
fix scale problem in DefaultViewPort::controlImagePosition()
2021-07-07 12:35:11 +08:00
Alexander Alekhin
9a9954a036
Merge tag '3.4.15'
2021-07-04 21:32:19 +00:00
Alexander Alekhin
591708903b
release: OpenCV 3.4.15
2021-07-04 21:10:13 +00:00
Alexander Alekhin
f9d62fba7a
Merge pull request #20350 from alalek:issue_20285
2021-07-04 21:07:02 +00:00
Alexander Alekhin
9d039c206b
Merge pull request #20354 from alalek:issue_20353
2021-07-04 18:41:34 +00:00
Alexander Alekhin
4c3f9b2ef4
cmake: update Halide detection
2021-07-04 13:20:52 +03:00
Alexander Alekhin
0e523618a1
cmake: exclude -pthread from Emscripten default build
2021-07-03 11:13:28 +00:00
Alexander Alekhin
3b26105f68
Merge pull request #20346 from alalek:backport_20026
2021-07-03 00:27:55 +00:00
Alexander Alekhin
0f2f966a91
Merge pull request #20345 from mitruska:update_ngraph_normalizel2
2021-07-02 23:37:03 +00:00
Alexander Alekhin
d7d491d445
Merge pull request #20344 from alalek:backport_20343
2021-07-02 23:35:12 +00:00
Alexander Alekhin
9b0d6862c4
cmake(IE): extract INF_ENGINE_RELEASE from InferenceEngine package
2021-07-02 23:29:35 +00:00
Alexander Alekhin
890fcdf842
Merge pull request #20337 from alalek:build_opencv_winpack_dldt_2021.4.0
2021-07-02 21:47:14 +00:00
mitruska
18dbac203f
Use explicit version of ngraph NormalizeL2
2021-07-02 21:33:05 +00:00
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