potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2021-01-12 18:34:33 +00:00
parent 941a9792f7 fbcc532de5
commit d3bc563c6e
10 changed files with 464 additions and 1625 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/js_tutorials/js_assets/js_template_matching_matchTemplate.html
+2 -1
View File
@@ -74,7 +74,8 @@ let utils = new Utils('errorMessage');
utils.loadCode('codeSnippet', 'codeEditor');
utils.loadImageToCanvas('lena.jpg', 'imageCanvasInput');
utils.loadImageToCanvas('lenaFace.png', 'templateCanvasInput');
utils.addFileInputHandler('fileInput', 'canvasInput');
utils.addFileInputHandler('fileInput', 'imageCanvasInput');
utils.addFileInputHandler('templateFileInput', 'templateCanvasInput');
let tryIt = document.getElementById('tryIt');
tryIt.addEventListener('click', () => {
doc/js_tutorials/js_setup/js_usage/js_usage.markdown
+1 -1
View File
@@ -82,7 +82,7 @@ In this tutorial, we just show a cv.Mat on screen. To show a cv.Mat, you need a
You can use cv.imshow to show cv.Mat on the canvas.
@code{.js}
cv.imshow(mat, "outputCanvas");
cv.imshow("outputCanvas", mat);
@endcode
Putting all of the steps together, the final index.html is shown below.